From e0e9997a5e92ce2a31f0ff4d139109be4434105b Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Wed, 11 Apr 2012 21:19:48 +0200 Subject: 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 --- src/frames/loading_frame.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/frames/loading_frame.cpp') 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); -- cgit v1.2.3