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

Fix text being written outside the buttons in the multiplayer setup screen...

Browse source 
...by moving text ellipsis at size computation time. It means that
changing the size won't provoke an ellipsis now, but it doesn't matter
since the previous funcitonality was buggy and unused.
This commit is contained in:
Guillaume Melquiond 2005-05-29 20:52:40 +00:00
parent 5c26d00ba6
commit 9d6464aa8a
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/preferences.cpp
View file

@ -1048,6 +1048,7 @@ void preferences_dialog::process_event()
const config* const adv = get_advanced_pref();
if(adv != NULL) {
const config& pref = *adv;
advanced_button_.set_width(0);
advanced_button_.set_label(pref["name"]);
std::string value = prefs[pref["field"]];
if(value.empty()) {

24
src/widgets/button.cpp
View file

@ -36,8 +36,6 @@ button::button(CVideo& video, const std::string& label, button::TYPE type,
button_(true), state_(NORMAL), type_(type), enabled_(true), pressed_(false),
spacing_(spacing), base_height_(0), base_width_(0)
{
set_label(label);
if(button_image_name.empty() && type == TYPE_PRESS) {
button_image_name = "button";
} else if(button_image_name.empty() && type == TYPE_CHECK) {
@ -69,7 +67,7 @@ button::button(CVideo& video, const std::string& label, button::TYPE type,
base_height_ = button_image->h;
base_width_ = button_image->w;
calculate_size();
set_label(label);
if(type == TYPE_PRESS) {
image_.assign(scale_surface(button_image,location().w,location().h));
@ -86,10 +84,20 @@ button::button(CVideo& video, const std::string& label, button::TYPE type,
void button::calculate_size()
{
textRect_ = screen_area();
SDL_Rect const &loc = location();
bool change_size = loc.h == 0 || loc.w == 0;
textRect_ = font::draw_text(NULL,textRect_,font_size,
font::BUTTON_COLOUR,label_,0,0);
if (!change_size) {
unsigned w = loc.w - (type_ == TYPE_PRESS ? horizontal_padding :
checkbox_horizontal_padding + base_width_);
label_ = font::make_text_ellipsis(label_, font_size, w);
}
textRect_ = font::draw_text(NULL, screen_area(), font_size,
font::BUTTON_COLOUR, label_, 0, 0);
if (!change_size)
return;
#ifdef USE_TINY_GUI
set_height(textRect_.h+vertical_padding);
@ -182,8 +190,7 @@ void button::draw_contents()
}
video().blit_surface(loc.x, loc.y, image);
const std::string etext = font::make_text_ellipsis(label_, font_size, loc.w);
font::draw_text(&video(), clipArea, font_size, button_colour, etext, textx, texty);
font::draw_text(&video(), clipArea, font_size, button_colour, label_, textx, texty);
update_rect(loc);
}
@ -199,7 +206,6 @@ namespace {
void button::set_label(const std::string& val)
{
bg_restore();
label_ = val;
//if we have a list of items, use the first one that isn't an image