Mercurial > rinkhals
diff gamelib/gameboard.py @ 492:e8430f93b23a
toggling select/move can now be initiated from no selected tool and in any toolbar where select/move is allowed
| author | Adrianna Pińska <adrianna.pinska@gmail.com> |
|---|---|
| date | Wed, 25 Nov 2009 22:15:29 +0000 |
| parents | 8308bef91864 |
| children | ee883d390ff0 |
line wrap: on
line diff
--- a/gamelib/gameboard.py Wed Nov 25 22:12:08 2009 +0000 +++ b/gamelib/gameboard.py Wed Nov 25 22:15:29 2009 +0000 @@ -265,14 +265,15 @@ if not self.day: return if e.button == 3: # Right button - if self.selected_tool == constants.TOOL_PLACE_ANIMALS: - self.set_selected_tool(constants.TOOL_SELECT_CHICKENS, cursors.cursors["select"]) - if self.toolbar.IS_DEFAULT: - self.toolbar.toggle_select_on() - elif self.selected_tool == constants.TOOL_SELECT_CHICKENS: - self.set_selected_tool(constants.TOOL_PLACE_ANIMALS, cursors.cursors["chicken"]) - if self.toolbar.IS_DEFAULT: - self.toolbar.toggle_move_on() + if self.toolbar.MOVE_SELECT_PERMITTED: + if self.selected_tool != constants.TOOL_SELECT_CHICKENS: + self.set_selected_tool(constants.TOOL_SELECT_CHICKENS, cursors.cursors["select"]) + if self.toolbar.IS_DEFAULT: + self.toolbar.toggle_select_on() + elif self.selected_tool == constants.TOOL_SELECT_CHICKENS: + self.set_selected_tool(constants.TOOL_PLACE_ANIMALS, cursors.cursors["chicken"]) + if self.toolbar.IS_DEFAULT: + self.toolbar.toggle_move_on() return elif e.button == 2: # Middle button self.reset_states()