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

Create brushes for area list once

Browse Source
This commit is contained in:
scatterflower 2020-08-15 19:47:24 -05:00
parent 8b44d4ae95
commit 102ca4d641
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/courtroom.h
View File

@ -457,6 +457,14 @@ private:
QString current_background = "default"; QString current_background = "default";
QString current_side = ""; QString current_side = "";
QBrush free_brush;
QBrush lfp_brush;
QBrush casing_brush;
QBrush recess_brush;
QBrush rp_brush;
QBrush gaming_brush;
QBrush locked_brush;
AOMusicPlayer *music_player; AOMusicPlayer *music_player;
AOSfxPlayer *sfx_player; AOSfxPlayer *sfx_player;
AOSfxPlayer *objection_player; AOSfxPlayer *objection_player;

17
src/courtroom.cpp
View File

@ -70,6 +70,14 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
ui_background = new AOImage(this, ao_app); ui_background = new AOImage(this, ao_app);
free_brush = *new QBrush(ao_app->get_color("area_free_color", "courtroom_design.ini"));
lfp_brush = *new QBrush(ao_app->get_color("area_lfp_color", "courtroom_design.ini"));
casing_brush = *new QBrush(ao_app->get_color("area_casing_color", "courtroom_design.ini"));
recess_brush = *new QBrush(ao_app->get_color("area_recess_color", "courtroom_design.ini"));
rp_brush = *new QBrush(ao_app->get_color("area_rp_color", "courtroom_design.ini"));
gaming_brush = *new QBrush(ao_app->get_color("area_gaming_color", "courtroom_design.ini"));
locked_brush = *new QBrush(ao_app->get_color("area_locked_color", "courtroom_design.ini"));
ui_viewport = new QWidget(this); ui_viewport = new QWidget(this);
ui_vp_background = new AOScene(ui_viewport, ao_app); ui_vp_background = new AOScene(ui_viewport, ao_app);
ui_vp_speedlines = new AOMovie(ui_viewport, ao_app); ui_vp_speedlines = new AOMovie(ui_viewport, ao_app);
@ -1433,15 +1441,6 @@ void Courtroom::list_areas()
ui_area_list->clear(); ui_area_list->clear();
// ui_music_search->setText(""); // ui_music_search->setText("");
QString f_file = "courtroom_design.ini";
QBrush free_brush(ao_app->get_color("area_free_color", f_file));
QBrush lfp_brush(ao_app->get_color("area_lfp_color", f_file));
QBrush casing_brush(ao_app->get_color("area_casing_color", f_file));
QBrush recess_brush(ao_app->get_color("area_recess_color", f_file));
QBrush rp_brush(ao_app->get_color("area_rp_color", f_file));
QBrush gaming_brush(ao_app->get_color("area_gaming_color", f_file));
QBrush locked_brush(ao_app->get_color("area_locked_color", f_file));
int n_listed_areas = 0; int n_listed_areas = 0;