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

fixed bug where bottom of chat window in multiplayer lobby ...

Browse source 
...couldn't always be seen
This commit is contained in:
Dave White 2004-05-10 03:03:51 +00:00
parent b2ff8a3e43
commit 0435de8eed
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/display.cpp
View file

@ -2092,9 +2092,9 @@ void display::create_buttons()
std::cerr << "c\n";
b.set_location(loc.x,loc.y);
// if(rects_overlap(b.location(),map_area())) {
// b.set_volatile(true);
// }
if(rects_overlap(b.location(),map_area())) {
b.set_volatile(true);
}
std::cerr << "d\n";
buttons_.push_back(b);
@ -2140,6 +2140,9 @@ void display::add_chat_message(const std::string& speaker, int side, const std::
str << font::NULL_MARKUP << "*" << speaker << "*";
}
std::stringstream message_str;
message_str << font::NULL_MARKUP << msg;
SDL_Color speaker_colour = {255,255,255,255};
if(side >= 1) {
speaker_colour = font::get_side_colour(side);
@ -2150,7 +2153,7 @@ void display::add_chat_message(const std::string& speaker, int side, const std::
rect.x+chat_message_x,rect.y+ypos,
0,0,-1,rect,font::LEFT_ALIGN,&chat_message_bg,chat_message_border);
const int message_handle = font::add_floating_label(msg,12,chat_message_colour,
const int message_handle = font::add_floating_label(message_str.str(),12,chat_message_colour,
rect.x + chat_message_x + font::get_floating_label_rect(speaker_handle).w,rect.y+ypos,
0,0,-1,rect,font::LEFT_ALIGN,&chat_message_bg,chat_message_border);

2
src/widgets/textbox.cpp
View file

@ -133,7 +133,7 @@ void textbox::draw()
const size_t max_height = scrollbar_.location().h;
const size_t proportion = (loc.h*100)/text_image_->h;
const size_t grip_height = (max_height*proportion)/100;
const size_t grip_height = maximum<size_t>((max_height*proportion)/100,scrollbar_.get_minimum_grip_height());
scrollbar_.set_grip_height(grip_height);
const size_t max_y = text_image_->h - loc.h;