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

Prevent tool buttons being drawn off the edge of the window when scrollable

Browse Source
This commit is contained in:
Simon Robertshaw 2012-06-23 00:48:01 +01:00
parent 6352888c68
commit 009de99f02
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/game/GameView.cpp
View File

@ -497,7 +497,13 @@ void GameView::setToolButtonOffset(int offset)
for(vector<ToolButton*>::iterator iter = toolButtons.begin(), end = toolButtons.end(); iter!=end; ++iter)
{
(*iter)->Position.X -= offset;
ToolButton * button = *iter;
button->Position.X -= offset;
if(button->Position.X <= 0 || (button->Position.X+button->Size.X) > XRES-2) {
button->Visible = false;
} else {
button->Visible = true;
}
}
}
@ -826,12 +832,12 @@ void GameView::DoMouseMove(int x, int y, int dx, int dy)
if(toolButtons.size())
{
int totalWidth = (toolButtons[0]->Size.X+1)*toolButtons.size();
if(totalWidth > XRES-10)
if(totalWidth > XRES-15)
{
int mouseX = x;
if(mouseX > XRES)
mouseX = XRES;
float overflow = totalWidth-(XRES-10), mouseLocation = float(XRES)/float(mouseX-(XRES));
float overflow = totalWidth-(XRES-15), mouseLocation = float(XRES)/float(mouseX-(XRES));
setToolButtonOffset(overflow/mouseLocation);
//Ensure that mouseLeave events are make their way to the buttons should they move from underneith the mouse pointer