0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New images for the zoom slider.

Browse source
This commit is contained in:
fendrin 2013-05-11 00:04:26 +02:00
parent e309a62043
commit 02f477a867
4 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/themes/editor.cfg
View file

@ -650,8 +650,9 @@
[/action]
[slider]
image=buttons/radiobox
id=map-zoom-slider
rect="=,+4,+150,+22"
rect="=,+8,+150,+18"
xanchor=right
yanchor=fixed
[/slider]

2
src/display.cpp
View file

@ -818,7 +818,7 @@ void display::create_buttons()
DBG_DP << "creating sliders...\n";
const std::vector<theme::slider>& sliders = theme_.sliders();
for(std::vector<theme::slider>::const_iterator i = sliders.begin(); i != sliders.end(); ++i) {
gui::slider s(screen_);
gui::slider s(screen_, i->image());
DBG_DP << "drawing button " << i->get_id() << "\n";
s.set_id(i->get_id());
const SDL_Rect& loc = i->location(screen_area());

18
src/widgets/slider.cpp
View file

@ -25,19 +25,19 @@
namespace {
const std::string slider_image = "buttons/slider.png";
const std::string disabled_image = "buttons/slider-disabled.png";
const std::string pressed_image = "buttons/slider-pressed.png";
const std::string active_image = "buttons/slider-active.png";
const std::string slider_image = ".png";
const std::string disabled_image = "-disabled.png";
const std::string pressed_image = "-pressed.png";
const std::string active_image = "-active.png";
}
namespace gui {
slider::slider(CVideo &video)
: widget(video), image_(image::get_image(slider_image)),
pressedImage_(image::get_image(pressed_image)),
activeImage_(image::get_image(active_image)),
disabledImage_(image::get_image(disabled_image)),
slider::slider(CVideo &video, const std::string& image)
: widget(video), image_(image::get_image(image + slider_image)),
pressedImage_(image::get_image(image + pressed_image)),
activeImage_(image::get_image(image + active_image)),
disabledImage_(image::get_image(image + disabled_image)),
min_(-100000), max_(100000), value_(0),
increment_(1), value_change_(false), state_(NORMAL)
{

2
src/widgets/slider.hpp
View file

@ -27,7 +27,7 @@ namespace gui {
class slider : public widget
{
public:
slider(CVideo &video);
slider(CVideo &video, const std::string& image = "buttons/slider");
void set_min(int value);
void set_max(int value);