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

Made the zoom slider line black.

Browse source
This commit is contained in:
fendrin 2013-05-15 01:52:28 +02:00
parent ff33acbc89
commit cdff4c166b
6 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/themes/editor.cfg
View file

@ -668,6 +668,7 @@
[slider]
image=buttons/sliders/slider_arrow_gold
id=map-zoom-slider
black_line=yes
ref=mini-map
rect="=,+1,+117,+18"
xanchor=right

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_, i->image());
gui::slider s(screen_, i->image(), i->black_line());
DBG_DP << "drawing button " << i->get_id() << "\n";
s.set_id(i->get_id());
const SDL_Rect& loc = i->location(screen_area());

6
src/theme.cpp
View file

@ -504,12 +504,14 @@ theme::slider::slider() :
title_(),
tooltip_(),
image_(),
overlay_()
overlay_(),
black_line_(false)
{}
theme::slider::slider(const config &cfg):
object(cfg),
title_(cfg["title"].str() + cfg["title_literal"].str()),
tooltip_(cfg["tooltip"]), image_(cfg["image"]), overlay_(cfg["overlay"])
tooltip_(cfg["tooltip"]), image_(cfg["image"]), overlay_(cfg["overlay"]),
black_line_(cfg["black_line"].to_bool(false))
{}
theme::menu::menu() :

3
src/theme.hpp
View file

@ -208,9 +208,12 @@ public:
const std::string& overlay() const { return overlay_; }
bool black_line() const { return black_line_; }
void set_title(const std::string& new_title) { title_ = new_title; }
private:
std::string title_, tooltip_, image_, overlay_;
bool black_line_;
};
class menu : public object

5
src/widgets/slider.cpp
View file

@ -33,11 +33,12 @@ namespace {
namespace gui {
slider::slider(CVideo &video, const std::string& image)
slider::slider(CVideo &video, const std::string& image, bool black)
: 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)),
line_color_(black ? font::BLACK_COLOR : font::NORMAL_COLOR),
min_(-100000), max_(100000), value_(0),
increment_(1), value_change_(false), state_(NORMAL)
{
@ -152,7 +153,7 @@ void slider::draw_contents()
assert(image != NULL);
SDL_Color line_color = font::NORMAL_COLOR;
SDL_Color line_color = line_color_;
if (!enabled()) {
image.assign(disabledImage_);
line_color = font::DISABLED_COLOR;

3
src/widgets/slider.hpp
View file

@ -27,7 +27,7 @@ namespace gui {
class slider : public widget
{
public:
slider(CVideo &video, const std::string& image = "buttons/sliders/slider");
slider(CVideo &video, const std::string& image = "buttons/sliders/slider", bool black = false);
void set_min(int value);
void set_max(int value);
@ -58,6 +58,7 @@ private:
void set_slider_position(int x);
SDL_Rect slider_area() const;
surface image_, pressedImage_, activeImage_, disabledImage_;
SDL_Color line_color_;
int min_;
int max_;