aboutsummaryrefslogtreecommitdiffstats
path: root/src/frames/loading_frame.cpp
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2012-04-11 21:19:48 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2013-01-13 22:40:52 +0100
commite0e9997a5e92ce2a31f0ff4d139109be4434105b (patch)
treee8c3baa67eb65ffc16a9c96fdbb067d142f194bd /src/frames/loading_frame.cpp
parent40caf6163ff2e1274d71146c207fbde0c099b089 (diff)
downloadusdx-e0e9997a5e92ce2a31f0ff4d139109be4434105b.tar.gz
usdx-e0e9997a5e92ce2a31f0ff4d139109be4434105b.tar.xz
usdx-e0e9997a5e92ce2a31f0ff4d139109be4434105b.zip
menu: generalized frame_background to background
background could now be a background for all DrawableControl instances each subclass should call the parents draw() during executing the draw() method for background painting TODO: background should know the size of the control to only draw the background there
Diffstat (limited to '')
-rw-r--r--src/frames/loading_frame.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/frames/loading_frame.cpp b/src/frames/loading_frame.cpp
index 31458b7f..ef05bd48 100644
--- a/src/frames/loading_frame.cpp
+++ b/src/frames/loading_frame.cpp
@@ -25,8 +25,8 @@
*/
#include "loading_frame.hpp"
-#include "menu/frame_background_image.hpp"
-#include "menu/frame_background_color.hpp"
+#include "menu/background_image.hpp"
+#include "menu/background_color.hpp"
#include "menu/text.hpp"
namespace usdx
@@ -38,8 +38,8 @@ namespace usdx
Frame(app)
{
// RgbColor background(100, 100, 100);
-// set_background(new FrameBackgroundColor(background));
- set_background(new FrameBackgroundImage("game/themes/Deluxe/[bg-load]blue.jpg"));
+// set_background(new BackgroundColor(background));
+ set_background(new BackgroundImage("game/themes/Deluxe/[bg-load]blue.jpg"));
DrawableControl *c = new Text(this, "Halloäöüß");
c->set_position(100, 100);