Improve appearance of some dialogues, style defaults

1 files changed, 12 insertions, 11 deletions

diff --git a/src/options/OptionsView.cpp b/src/options/OptionsView.cpp
index d1066a8..f88be26 100644
--- a/src/options/OptionsView.cpp
+++ b/src/options/OptionsView.cpp
@@ -6,15 +6,16 @@
  */
 
 #include "OptionsView.h"
+#include "Style.h"
 #include "interface/Button.h"
 #include "interface/Label.h"
 #include "interface/DropDown.h"
 
 OptionsView::OptionsView():
-	ui::Window(ui::Point(-1, -1), ui::Point(300, 300)){
+	ui::Window(ui::Point(-1, -1), ui::Point(300, 206)){
 
-	ui::Label * tempLabel = new ui::Label(ui::Point(3, 3), ui::Point(Size.X-6, 14), "Simulation Options");
-	tempLabel->SetTextColour(ui::Colour(255, 220, 0));
+	ui::Label * tempLabel = new ui::Label(ui::Point(4, 5), ui::Point(Size.X-8, 14), "Simulation Options");
+	tempLabel->SetTextColour(style::Colour::InformationTitle);
 	tempLabel->SetAlignment(AlignLeft, AlignMiddle);
 	AddComponent(tempLabel);
 
@@ -26,7 +27,7 @@ OptionsView::OptionsView():
 		virtual void ActionCallback(ui::Checkbox * sender){	v->c->SetHeatSimulation(sender->GetChecked()); }
 	};
 
-	heatSimulation = new ui::Checkbox(ui::Point(3, 23), ui::Point(Size.X-6, 16), "Heat simulation \bgIntroduced in version 34");
+	heatSimulation = new ui::Checkbox(ui::Point(8, 23), ui::Point(Size.X-6, 16), "Heat simulation \bgIntroduced in version 34");
 	heatSimulation->SetActionCallback(new HeatSimulationAction(this));
 	AddComponent(heatSimulation);
 	tempLabel = new ui::Label(ui::Point(24, heatSimulation->Position.Y+14), ui::Point(Size.X-28, 16), "\bgCan cause odd behaviour with very old saves");
@@ -41,7 +42,7 @@ OptionsView::OptionsView():
 		virtual void ActionCallback(ui::Checkbox * sender){	v->c->SetAmbientHeatSimulation(sender->GetChecked()); }
 	};
 
-	ambientHeatSimulation = new ui::Checkbox(ui::Point(3, 53), ui::Point(Size.X-6, 16), "Ambient heat simulation \bgIntroduced in version 50");
+	ambientHeatSimulation = new ui::Checkbox(ui::Point(8, 53), ui::Point(Size.X-6, 16), "Ambient heat simulation \bgIntroduced in version 50");
 	ambientHeatSimulation->SetActionCallback(new AmbientHeatSimulationAction(this));
 	AddComponent(ambientHeatSimulation);
 	tempLabel = new ui::Label(ui::Point(24, ambientHeatSimulation->Position.Y+14), ui::Point(Size.X-28, 16), "\bgCan cause odd behaviour with old saves");
@@ -56,7 +57,7 @@ OptionsView::OptionsView():
 		virtual void ActionCallback(ui::Checkbox * sender){	v->c->SetNewtonianGravity(sender->GetChecked()); }
 	};
 
-	newtonianGravity = new ui::Checkbox(ui::Point(3, 83), ui::Point(Size.X-6, 16), "Newtonian gravity \bgIntroduced in version 48");
+	newtonianGravity = new ui::Checkbox(ui::Point(8, 83), ui::Point(Size.X-6, 16), "Newtonian gravity \bgIntroduced in version 48");
 	newtonianGravity->SetActionCallback(new NewtonianGravityAction(this));
 	AddComponent(newtonianGravity);
 	tempLabel = new ui::Label(ui::Point(24, newtonianGravity->Position.Y+14), ui::Point(Size.X-28, 16), "\bgMay cause poor performance on older computers");
@@ -71,7 +72,7 @@ OptionsView::OptionsView():
 			virtual void ActionCallback(ui::Checkbox * sender){	v->c->SetWaterEqualisation(sender->GetChecked()); }
 		};
 
-	waterEqualisation = new ui::Checkbox(ui::Point(3, 113), ui::Point(Size.X-6, 16), "Water equalisation \bgIntroduced in version 61");
+	waterEqualisation = new ui::Checkbox(ui::Point(8, 113), ui::Point(Size.X-6, 16), "Water equalisation \bgIntroduced in version 61");
 	waterEqualisation->SetActionCallback(new WaterEqualisationAction(this));
 	AddComponent(waterEqualisation);
 	tempLabel = new ui::Label(ui::Point(24, waterEqualisation->Position.Y+14), ui::Point(Size.X-28, 16), "\bgMay cause poor performance with a lot of water");
@@ -85,7 +86,7 @@ OptionsView::OptionsView():
 		AirModeChanged(OptionsView * v): v(v) { }
 		virtual void OptionChanged(ui::DropDown * sender, std::pair<std::string, int> option) { v->c->SetAirMode(option.second); }
 	};
-	airMode = new ui::DropDown(ui::Point(Size.X-85, 143), ui::Point(80, 16));
+	airMode = new ui::DropDown(ui::Point(Size.X-88, 146), ui::Point(80, 16));
 	AddComponent(airMode);
 	airMode->AddOption(std::pair<std::string, int>("On", 0));
 	airMode->AddOption(std::pair<std::string, int>("Pressure off", 1));
@@ -94,7 +95,7 @@ OptionsView::OptionsView():
 	airMode->AddOption(std::pair<std::string, int>("No Update", 4));
 	airMode->SetActionCallback(new AirModeChanged(this));
 		
-	tempLabel = new ui::Label(ui::Point(3, 143), ui::Point(Size.X-90, 16), "Air Simulation Mode");
+	tempLabel = new ui::Label(ui::Point(8, 146), ui::Point(Size.X-96, 16), "Air Simulation Mode");
 	tempLabel->SetAlignment(AlignLeft, AlignMiddle);
 	AddComponent(tempLabel);
 		
@@ -106,14 +107,14 @@ OptionsView::OptionsView():
 		virtual void OptionChanged(ui::DropDown * sender, std::pair<std::string, int> option) { v->c->SetGravityMode(option.second); }
 	};	
 		
-	gravityMode = new ui::DropDown(ui::Point(Size.X-85, 163), ui::Point(80, 16));
+	gravityMode = new ui::DropDown(ui::Point(Size.X-88, 166), ui::Point(80, 16));
 	AddComponent(gravityMode);
 	gravityMode->AddOption(std::pair<std::string, int>("Vertical", 0));
 	gravityMode->AddOption(std::pair<std::string, int>("Off", 1));
 	gravityMode->AddOption(std::pair<std::string, int>("Radial", 2));
 	gravityMode->SetActionCallback(new GravityModeChanged(this));
 
-	tempLabel = new ui::Label(ui::Point(3, 163), ui::Point(Size.X-90, 16), "Gravity Simulation Mode");
+	tempLabel = new ui::Label(ui::Point(8, 166), ui::Point(Size.X-96, 16), "Gravity Simulation Mode");
 	tempLabel->SetAlignment(AlignLeft, AlignMiddle);
 	AddComponent(tempLabel);