matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't resize save buttons in the online save browser, fix selection bug in console

Browse Source
This commit is contained in:
jacob1 2014-03-25 14:44:58 -04:00
parent 50bc126e6d
commit 2e6b4242d6
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/interface/Label.cpp
View File

@ -346,8 +346,8 @@ void Label::updateSelection()
void Label::SetDisplayText(std::string newText) void Label::SetDisplayText(std::string newText)
{ {
displayText = newText; ClearSelection();
tDisplayText = displayText; displayText = tDisplayText = newText;
} }
void Label::Draw(const Point& screenPos) void Label::Draw(const Point& screenPos)

9
src/gui/interface/SaveButton.cpp
View File

@ -180,19 +180,16 @@ void SaveButton::Draw(const Point& screenPos)
g->fillrect(screenPos.X, screenPos.Y, Size.X, Size.Y, 100, 170, 255, 100); 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) if(thumbnail)
{ {
thumbBoxSize = ui::Point(thumbnail->Width, thumbnail->Height); //thumbBoxSize = ui::Point(thumbnail->Width, thumbnail->Height);
if(save && save->id) 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); g->draw_image(thumbnail, screenPos.X-3+(Size.X-thumbBoxSize.X)/2, screenPos.Y+(Size.Y-21-thumbBoxSize.Y)/2, 255);
else else
g->draw_image(thumbnail, screenPos.X+(Size.X-thumbBoxSize.X)/2, screenPos.Y+(Size.Y-21-thumbBoxSize.Y)/2, 255); 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)
{ {
if(save->id) if(save->id)