summaryrefslogtreecommitdiff
path: root/src/options
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-04-17 14:56:57 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-04-17 14:56:57 (GMT)
commitc261030cef6f63110fecf00aa2d2a22bbb953690 (patch)
treefd5669cef51195df75fca7d90b834af66fe4a9de /src/options
parentc3c31b20b07d1971091cf225311a86c51b64e2ca (diff)
downloadpowder-c261030cef6f63110fecf00aa2d2a22bbb953690.zip
powder-c261030cef6f63110fecf00aa2d2a22bbb953690.tar.gz
Started on dropdown control
Diffstat (limited to 'src/options')
-rw-r--r--src/options/OptionsView.cpp3
-rw-r--r--src/options/OptionsView.h3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/options/OptionsView.cpp b/src/options/OptionsView.cpp
index 9f07df9..d863844 100644
--- a/src/options/OptionsView.cpp
+++ b/src/options/OptionsView.cpp
@@ -77,6 +77,9 @@ OptionsView::OptionsView():
tempLabel->SetAlignment(AlignLeft, AlignMiddle);
AddComponent(tempLabel);
+ airMode = new ui::DropDown(ui::Point(Size.X-55, 143), ui::Point(50, 16));//, "Water equalisation \bgIntroduced in version 61");
+ //airMode->SetActionCallback(new WaterEqualisationAction(this));
+ AddComponent(airMode);
tempLabel = new ui::Label(ui::Point(3, 143), ui::Point(Size.X-24, 16), "Air Simulation Mode");
tempLabel->SetAlignment(AlignLeft, AlignMiddle);
AddComponent(tempLabel);
diff --git a/src/options/OptionsView.h b/src/options/OptionsView.h
index 52d84b1..5103f23 100644
--- a/src/options/OptionsView.h
+++ b/src/options/OptionsView.h
@@ -11,6 +11,7 @@
#include "interface/Window.h"
#include "OptionsController.h"
#include "interface/Checkbox.h"
+#include "interface/DropDown.h"
#include "OptionsModel.h"
class OptionsModel;
@@ -21,6 +22,8 @@ class OptionsView: public ui::Window {
ui::Checkbox * ambientHeatSimulation;
ui::Checkbox * newtonianGravity;
ui::Checkbox * waterEqualisation;
+ ui::DropDown * airMode;
+ ui::DropDown * gravityMode;
public:
OptionsView();
void NotifySettingsChanged(OptionsModel * sender);