aboutsummaryrefslogtreecommitdiff
path: root/include/courtroom.h
diff options
context:
space:
mode:
authorCrystalwarrior <varsash@gmail.com>2021-02-16 11:04:07 +0300
committerCrystalwarrior <varsash@gmail.com>2021-02-16 11:04:07 +0300
commit5063880530c98d17e6d15a888f7c4a8462351e52 (patch)
tree06c1d2e35d997d76ac41465e65ad96c8535ddb46 /include/courtroom.h
parent005ecca9d79e6a5973df487b6b4e094003e361a6 (diff)
Patch a segfault by play_frame_effect being wacky
Split behavior for courtroom resizing into its own function Use that function to optimize character changing screen Fix reload theme breaking the background positioning Fix changing character breaking the background positioning Fix excessive set_widgets() calls that caused unnecessary lag Fix unnecessary set_size_and_pos calls that didn't need to be there Only call size_and_pos on the chatbox in the initialize_chatbox func Remove checks for a boolean that will always be true Simplify two functions that copy-paste code called set_size_and_pos into a single one Fix "disable custom chat" setting not being used when setting chat sizes and pos
Diffstat (limited to 'include/courtroom.h')
-rw-r--r--include/courtroom.h14
1 files changed, 5 insertions, 9 deletions
diff --git a/include/courtroom.h b/include/courtroom.h
index eb1aa7b6..69dd58e1 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -121,6 +121,9 @@ public:
void character_loading_finished();
+ //
+ void set_courtroom_size();
+
// sets position of widgets based on theme ini files
void set_widgets();
@@ -147,11 +150,8 @@ public:
void set_window_title(QString p_title);
- // reads theme inis and sets size and pos based on the identifier
- void set_size_and_pos(QWidget *p_widget, QString p_identifier);
-
- // reads theme and char inis and sets size and pos based on the identifier
- void set_size_and_pos(QWidget *p_widget, QString p_identifier, QString p_char);
+ // reads theme and sets size and pos based on the identifier (using p_misc if provided)
+ void set_size_and_pos(QWidget *p_widget, QString p_identifier, QString p_misc="");
// reads theme inis and returns the size and pos as defined by it
QPoint get_theme_pos(QString p_identifier);
@@ -576,10 +576,6 @@ private:
int evidence_rows = 3;
int max_evidence_on_page = 18;
- // is set to true if the bg folder contains defensedesk.png,
- // prosecutiondesk.png and stand.png
- bool is_ao2_bg = false;
-
// whether the ooc chat is server or master chat, true is server
bool server_ooc = true;