From 2e6b4242d6248749c4648e6fd49ba7dc38e60873 Mon Sep 17 00:00:00 2001 From: jacob1 Date: Tue, 25 Mar 2014 14:44:58 -0400 Subject: [PATCH] don't resize save buttons in the online save browser, fix selection bug in console --- src/gui/interface/Label.cpp | 4 ++-- src/gui/interface/SaveButton.cpp | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/gui/interface/Label.cpp b/src/gui/interface/Label.cpp index 24b8035b6..047fd50f6 100644 --- a/src/gui/interface/Label.cpp +++ b/src/gui/interface/Label.cpp @@ -346,8 +346,8 @@ void Label::updateSelection() void Label::SetDisplayText(std::string newText) { - displayText = newText; - tDisplayText = displayText; + ClearSelection(); + displayText = tDisplayText = newText; } void Label::Draw(const Point& screenPos) diff --git a/src/gui/interface/SaveButton.cpp b/src/gui/interface/SaveButton.cpp index 7e67e488e..6406d353c 100644 --- a/src/gui/interface/SaveButton.cpp +++ b/src/gui/interface/SaveButton.cpp @@ -180,19 +180,16 @@ void SaveButton::Draw(const Point& screenPos) g->fillrect(screenPos.X, screenPos.Y, Size.X, Size.Y, 100, 170, 255, 100); } + scaleFactor = (Size.Y-25)/((float)YRES); + thumbBoxSize = ui::Point(((float)XRES)*scaleFactor, ((float)YRES)*scaleFactor); if(thumbnail) { - thumbBoxSize = ui::Point(thumbnail->Width, thumbnail->Height); + //thumbBoxSize = ui::Point(thumbnail->Width, thumbnail->Height); if(save && save->id) g->draw_image(thumbnail, screenPos.X-3+(Size.X-thumbBoxSize.X)/2, screenPos.Y+(Size.Y-21-thumbBoxSize.Y)/2, 255); else g->draw_image(thumbnail, screenPos.X+(Size.X-thumbBoxSize.X)/2, screenPos.Y+(Size.Y-21-thumbBoxSize.Y)/2, 255); } - else - { - scaleFactor = (Size.Y-25)/((float)YRES); - thumbBoxSize = ui::Point(((float)XRES)*scaleFactor, ((float)YRES)*scaleFactor); - } if(save) { if(save->id)