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

fix not being able to draw tool lines or boxes, but you can still press ctrl+shift before clicking to use 10x strength

Browse Source
This commit is contained in:
jacob1 2013-06-05 10:55:46 -04:00
parent 69407a2b57
commit 875ca75b07
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/gui/game/GameView.cpp
View File

@ -1282,13 +1282,15 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
drawModeReset = false; drawModeReset = false;
else else
drawPoint1 = currentMouse; drawPoint1 = currentMouse;
if (!toolBrush) if(shift)
{ {
if(shift) if (!toolBrush)
drawMode = DrawFill; drawMode = DrawFill;
else else
drawMode = DrawRect; drawMode = DrawPoints;
} }
else
drawMode = DrawRect;
} }
enableCtrlBehaviour(); enableCtrlBehaviour();
break; break;
@ -1299,13 +1301,15 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
drawModeReset = false; drawModeReset = false;
else else
drawPoint1 = currentMouse; drawPoint1 = currentMouse;
if (!toolBrush) if(ctrl)
{ {
if(ctrl) if (!toolBrush)
drawMode = DrawFill; drawMode = DrawFill;
else else
drawMode = DrawLine; drawMode = DrawPoints;
} }
else
drawMode = DrawLine;
} }
enableShiftBehaviour(); enableShiftBehaviour();
break; break;
@ -1766,7 +1770,8 @@ void GameView::enableShiftBehaviour()
if(!shiftBehaviour) if(!shiftBehaviour)
{ {
shiftBehaviour = true; shiftBehaviour = true;
c->SetToolStrength(10.0f); if(isMouseDown || (toolBrush && drawMode == DrawPoints))
c->SetToolStrength(10.0f);
} }
} }
@ -1811,10 +1816,13 @@ void GameView::enableCtrlBehaviour()
searchButton->Appearance.TextInactive = searchButton->Appearance.TextHover = ui::Colour(0, 0, 0); searchButton->Appearance.TextInactive = searchButton->Appearance.TextHover = ui::Colour(0, 0, 0);
if (currentSaveType == 2) if (currentSaveType == 2)
((SplitButton*)saveSimulationButton)->SetShowSplit(true); ((SplitButton*)saveSimulationButton)->SetShowSplit(true);
if(!shiftBehaviour) if(isMouseDown || (toolBrush && drawMode == DrawPoints))
c->SetToolStrength(.1f); {
else if(!shiftBehaviour)
c->SetToolStrength(10.0f); c->SetToolStrength(.1f);
else
c->SetToolStrength(10.0f);
}
} }
} }