diff options
| author | jacob1 <jfu614@gmail.com> | 2013-02-09 05:01:00 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-02-09 05:01:00 (GMT) |
| commit | a989d977442674232a8512bb52ff06af1b93c58a (patch) | |
| tree | 38893776f5d94b1f80a9fd2af8a377501d17f257 /src/game/GameView.cpp | |
| parent | 685bde5c21b4c1cfb29fd0694a72bd48e3af52fe (diff) | |
| download | powder-a989d977442674232a8512bb52ff06af1b93c58a.zip powder-a989d977442674232a8512bb52ff06af1b93c58a.tar.gz | |
flood fill / sample brush shape, fix rectangle snapping
Diffstat (limited to 'src/game/GameView.cpp')
| -rw-r--r-- | src/game/GameView.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp index 3e874e2..c8b4684 100644 --- a/src/game/GameView.cpp +++ b/src/game/GameView.cpp @@ -997,7 +997,7 @@ void GameView::OnMouseMove(int x, int y, int dx, int dy) void GameView::OnMouseDown(int x, int y, unsigned button) { - if(altBehaviour && !shiftBehaviour) + if(altBehaviour && !shiftBehaviour && !ctrlBehaviour) button = BUTTON_MIDDLE; if(selectMode!=SelectNone) { @@ -1817,11 +1817,11 @@ void GameView::OnDraw() } activeBrush->RenderLine(ren, c->PointTranslate(initialDrawPoint), finalCurrentMouse); } - else if(drawMode==DrawFill) + else if(drawMode==DrawFill || altBehaviour) { activeBrush->RenderFill(ren, finalCurrentMouse); } - if (drawMode == DrawPoints || drawMode==DrawLine || (drawMode == DrawRect && !isMouseDown)) + if ((drawMode == DrawPoints || drawMode==DrawLine || (drawMode == DrawRect && !isMouseDown)) && !altBehaviour) { if(wallBrush) { |