diff --git a/src/commands/cmd_cel_properties.cpp b/src/commands/cmd_cel_properties.cpp index 0bbf3a75f..1546a8dfd 100644 --- a/src/commands/cmd_cel_properties.cpp +++ b/src/commands/cmd_cel_properties.cpp @@ -21,14 +21,12 @@ #include #include "jinete/jinete.h" -#include "Vaca/SharedPtr.h" #include "commands/command.h" #include "sprite_wrappers.h" #include "app.h" #include "core/core.h" #include "modules/gui.h" -#include "modules/skinneable_theme.h" #include "raster/cel.h" #include "raster/image.h" #include "raster/layer.h" @@ -87,9 +85,7 @@ void CelPropertiesCommand::execute(Context* context) "ok", &button_ok, NULL); // Mini look for the opacity slider - Vaca::SharedPtr skinProp(new SkinProperty); - skinProp->setMiniLook(true); - slider_opacity->setProperty(skinProp); + setup_mini_look(slider_opacity); /* if the layer isn't writable */ if (!layer->is_writable()) { diff --git a/src/modules/gui.cpp b/src/modules/gui.cpp index 89c839885..f33e49bf3 100644 --- a/src/modules/gui.cpp +++ b/src/modules/gui.cpp @@ -31,6 +31,7 @@ #include "jinete/jinete.h" #include "jinete/jintern.h" +#include "Vaca/SharedPtr.h" #include "commands/command.h" #include "commands/commands.h" @@ -773,6 +774,13 @@ void get_widgets(JWidget window, ...) va_end(ap); } +void setup_mini_look(Widget* widget) +{ + Vaca::SharedPtr skinProp(new SkinProperty); + skinProp->setMiniLook(true); + widget->setProperty(skinProp); +} + /**********************************************************************/ /* Icon in buttons */ diff --git a/src/modules/gui.h b/src/modules/gui.h index 551974e4d..99021c622 100644 --- a/src/modules/gui.h +++ b/src/modules/gui.h @@ -88,6 +88,8 @@ void hook_signal(Widget* widget, void get_widgets(Widget* window, ...); +void setup_mini_look(Widget* widget); + void add_gfxicon_to_button(Widget* button, int gfx_id, int icon_align); void set_gfxicon_in_button(Widget* button, int gfx_id); diff --git a/src/widgets/statebar.cpp b/src/widgets/statebar.cpp index 6bdf6fd52..166cb418b 100644 --- a/src/widgets/statebar.cpp +++ b/src/widgets/statebar.cpp @@ -24,7 +24,6 @@ #include #include "Vaca/Bind.h" -#include "Vaca/SharedPtr.h" #include "jinete/jinete.h" #include "app.h" @@ -34,7 +33,6 @@ #include "modules/gfx.h" #include "modules/gui.h" #include "modules/palettes.h" -#include "modules/skinneable_theme.h" #include "raster/cel.h" #include "raster/layer.h" #include "raster/sprite.h" @@ -79,11 +77,7 @@ JWidget statusbar_new() { \ (name) = jbutton_new(text); \ (name)->user_data[0] = statusbar; \ - \ - Vaca::SharedPtr skinProp(new SkinProperty); \ - skinProp->setMiniLook(true); \ - (name)->setProperty(skinProp); \ - \ + setup_mini_look(name); \ jbutton_add_command_data((name), button_command, (void *)(data)); \ } @@ -114,9 +108,7 @@ JWidget statusbar_new() BUTTON_NEW(statusbar->b_layer, "*Current Layer*", ACTION_LAYER); statusbar->slider = jslider_new(0, 255, 255); - Vaca::SharedPtr skinProp(new SkinProperty); - skinProp->setMiniLook(true); - statusbar->slider->setProperty(skinProp); + setup_mini_look(statusbar->slider); ICON_NEW(statusbar->b_first, GFX_ANI_FIRST, ACTION_FIRST); ICON_NEW(statusbar->b_prev, GFX_ANI_PREV, ACTION_PREV);