Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add "chatbox_always_show" courtroom_config.ini option (#725)

Browse Source 
* Add "chatbox_always_show" courtroom_config.ini option
Remove copy-pasted code from set_widgets for initializing chatbox

* make chatbox_always_show work with misc folders

* Fix sticker disappearing despite chatbox_always_show setting

Co-authored-by: stonedDiscord <Tukz@gmx.de>
This commit is contained in:
Crystalwarrior 2022-07-16 17:00:03 +03:00 committed by GitHub
parent fef33dfc4f
commit 229a423e0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/courtroom.h
View File

@ -411,6 +411,7 @@ private:
int rainbow_counter = 0;
bool rainbow_appended = false;
bool blank_blip = false;
bool chatbox_always_show = false;
// Used for getting the current maximum blocks allowed in the IC chatlog.
int log_maximum_blocks = 0;

70
src/courtroom.cpp
View File

@ -689,19 +689,6 @@ void Courtroom::set_widgets()
ui_vp_evidence_display->combo_resize(ui_viewport->width(),
ui_viewport->height());
ui_vp_chat_arrow->move(0, 0);
pos_size_type design_ini_result =
ao_app->get_element_dimensions("chat_arrow", "courtroom_design.ini");
if (design_ini_result.width < 0 || design_ini_result.height < 0) {
qWarning() << "could not find \"chat_arrow\" in courtroom_design.ini";
ui_vp_chat_arrow->hide();
}
else {
ui_vp_chat_arrow->move(design_ini_result.x + ui_vp_chatbox->x(), design_ini_result.y + ui_vp_chatbox->y());
ui_vp_chat_arrow->combo_resize(design_ini_result.width, design_ini_result.height);
}
// layering shenanigans with ui_vp_chatbox prevent us from doing the sensible
// thing, which is to parent these to ui_viewport. instead, AOLayer handles
// masking so we don't overlap parts of the UI, and they become free floating
@ -790,15 +777,12 @@ void Courtroom::set_widgets()
ui_music_list->setIndentation(music_list_indentation.toInt());
QString music_list_animated = ao_app->get_design_element("music_list_animated", "courtroom_design.ini");
if (music_list_animated == "1")
ui_music_list->setAnimated(true);
else
ui_music_list->setAnimated(false);
ui_music_list->setAnimated(music_list_animated == "1" || music_list_animated.startsWith("true"));
set_size_and_pos(ui_music_name, "music_name");
ui_music_display->move(0, 0);
design_ini_result =
pos_size_type design_ini_result =
ao_app->get_element_dimensions("music_display", "courtroom_design.ini");
if (design_ini_result.width < 0 || design_ini_result.height < 0) {
@ -819,19 +803,7 @@ void Courtroom::set_widgets()
set_size_and_pos(ui_ic_chat_message, "ao2_ic_chat_message");
set_size_and_pos(ui_ic_chat_name, "ao2_ic_chat_name");
ui_vp_chatbox->set_image("chatblank");
ui_vp_chatbox->hide();
set_size_and_pos(ui_vp_showname, "showname");
set_size_and_pos(ui_vp_message, "message");
ui_vp_message->hide();
// We detached the text as parent from the chatbox so it doesn't get affected
// by the screenshake.
ui_vp_message->move(ui_vp_message->x() + ui_vp_chatbox->x(),
ui_vp_message->y() + ui_vp_chatbox->y());
ui_vp_message->setTextInteractionFlags(Qt::NoTextInteraction);
initialize_chatbox();
ui_vp_sticker->move(ui_viewport->x(), ui_viewport->y());
ui_vp_sticker->combo_resize(ui_viewport->width(),
@ -1378,7 +1350,15 @@ void Courtroom::set_background(QString p_background, bool display)
ui_vp_sideplayer_char->stop();
ui_vp_effect->stop();
ui_vp_message->hide();
ui_vp_chatbox->hide();
ui_vp_chatbox->setVisible(chatbox_always_show);
// Show it if chatbox always shows
if (ao_app->is_sticker_enabled() && chatbox_always_show) {
ui_vp_sticker->load_image(m_chatmessage[CHAR_NAME]);
}
// Hide the face sticker
else {
ui_vp_sticker->stop();
}
// Stop the chat arrow from animating
ui_vp_chat_arrow->hide();
@ -2432,9 +2412,15 @@ void Courtroom::display_character()
sfx_player->loop_clear();
// Hide the message and chatbox and handle the emotes
ui_vp_message->hide();
ui_vp_chatbox->hide();
ui_vp_chatbox->setVisible(chatbox_always_show);
// Show it if chatbox always shows
if (ao_app->is_sticker_enabled() && chatbox_always_show) {
ui_vp_sticker->load_image(m_chatmessage[CHAR_NAME]);
}
// Hide the face sticker
ui_vp_sticker->stop();
else {
ui_vp_sticker->stop();
}
// Initialize the correct pos (called SIDE here for some reason) with DESK_MOD to determine if we should hide the desk or not.
set_scene(m_chatmessage[DESK_MOD], m_chatmessage[SIDE]);
@ -2714,6 +2700,7 @@ void Courtroom::play_char_sfx(QString sfx_name)
void Courtroom::initialize_chatbox()
{
int f_charid = m_chatmessage[CHAR_ID].toInt();
if (f_charid >= 0 && f_charid < char_list.size() &&
(m_chatmessage[SHOWNAME].isEmpty() || !ui_showname_enable->isChecked())) {
@ -2733,6 +2720,12 @@ void Courtroom::initialize_chatbox()
set_size_and_pos(ui_vp_chatbox, "ao2_chatbox", p_misc);
set_size_and_pos(ui_vp_showname, "showname", p_misc);
set_size_and_pos(ui_vp_message, "message", p_misc);
QString result = ao_app->get_design_element("chatbox_always_show", "courtroom_design.ini", p_misc);
chatbox_always_show = result == "1" || result.startsWith("true");
// We detached the text as parent from the chatbox so it doesn't get affected
// by the screenshake.
ui_vp_message->move(ui_vp_message->x() + ui_vp_chatbox->x(),
ui_vp_message->y() + ui_vp_chatbox->y());
ui_vp_message->setTextInteractionFlags(Qt::NoTextInteraction);
@ -3441,8 +3434,15 @@ void Courtroom::start_chat_ticking()
ui_vp_message->show();
}
else {
ui_vp_chatbox->hide();
ui_vp_chatbox->setVisible(chatbox_always_show);
ui_vp_message->hide();
// Show it if chatbox always shows
if (ao_app->is_sticker_enabled() && chatbox_always_show)
ui_vp_sticker->load_image(m_chatmessage[CHAR_NAME]);
// Hide the face sticker
else {
ui_vp_sticker->stop();
}
}
// If we're not already waiting on the next message, start the timer. We could be overriden if there's an objection planned.
int delay = ao_app->stay_time();