started adding spacing to evidence

3 files changed, 24 insertions, 5 deletions

diff --git a/courtroom.cpp b/courtroom.cpp
index e838f05b..e0d407c7 100644
--- a/courtroom.cpp
+++ b/courtroom.cpp
@@ -182,7 +182,9 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
 
   ui_evidence_button = new AOButton(this, ao_app);
 
-  ui_evidence = new AOImage(this, ao_app);
+  construct_evidence();
+
+  construct_char_select();
 
   connect(keepalive_timer, SIGNAL(timeout()), this, SLOT(ping_server()));
 
@@ -249,12 +251,8 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
 
   connect(ui_evidence_button, SIGNAL(clicked()), this, SLOT(on_evidence_button_clicked()));
 
-  construct_char_select();
-
   set_widgets();
 
-  construct_evidence();
-
   set_char_select();
 }
 
diff --git a/courtroom.h b/courtroom.h
index 3bafbdcf..f83b6247 100644
--- a/courtroom.h
+++ b/courtroom.h
@@ -295,6 +295,7 @@ private:
   AOButton *ui_evidence_button;
   AOImage *ui_evidence;
   QLabel *ui_evidence_name;
+  QWidget *ui_evidence_buttons;
   QVector<AOEvidenceButton*> ui_evidence_list;
   AOImage *ui_evidence_left;
   AOImage *ui_evidence_right;
diff --git a/evidence.cpp b/evidence.cpp
index 90018fe8..1914f35e 100644
--- a/evidence.cpp
+++ b/evidence.cpp
@@ -4,6 +4,26 @@
 
 void Courtroom::construct_evidence()
 {
+  ui_evidence = new AOImage(this, ao_app);
+
+  ui_evidence_buttons = new QWidget(ui_evidence);
+
+  set_size_and_pos(ui_evidence, "evidence_background");
+  set_size_and_pos(ui_evidence_buttons, "evidence_buttons");
+
+  QPoint f_spacing = ao_app->get_button_spacing("evidence_button_spacing", "courtroom_design.ini");
+
+  //Todo: finish refactoring this
+  /*
+  const int button_width = 60;
+  int x_spacing = f_spacing.x();
+  int x_mod_count = 0;
+
+  const int button_height = 60;
+  int y_spacing = f_spacing.y();
+  int y_mod_count = 0;
+  */
+
   //constructing evidence button grid
   const int base_x_pos{28};
   const int base_y_pos{27};