# HG changeset patch # User jasoka@33b003aa-7bff-0310-803a-e67f0ece8222 # Date 1215686438 0 # Node ID 47fff0eee32ea6a3e721b705679a589d74d39812 # Parent 485f4c6dd9fc5ee2295c63158058391a036bcea7 event consumption fix for techdemo, pop-menu now works and gui clicks do not cause agent movement diff -r 485f4c6dd9fc -r 47fff0eee32e clients/rio_de_hola/scripts/world.py --- a/clients/rio_de_hola/scripts/world.py Mon Jul 07 09:44:07 2008 +0000 +++ b/clients/rio_de_hola/scripts/world.py Thu Jul 10 10:40:38 2008 +0000 @@ -192,6 +192,9 @@ self.cameras['main'].setRotation((currot + 5) % 360) def mousePressed(self, evt): + if evt.isConsumedByWidgets(): + return + clickpoint = fife.ScreenPoint(evt.getX(), evt.getY()) if (evt.getButton() == fife.MouseEvent.LEFT): self.hide_instancemenu() diff -r 485f4c6dd9fc -r 47fff0eee32e doc/dependencies/filedeps.dot --- a/doc/dependencies/filedeps.dot Mon Jul 07 09:44:07 2008 +0000 +++ b/doc/dependencies/filedeps.dot Thu Jul 10 10:40:38 2008 +0000 @@ -65,6 +65,7 @@ "engine/core/controller/engine.cpp" -> "view/renderers/cellselectionrenderer.h" "engine/core/controller/engine.cpp" -> "view/renderers/coordinaterenderer.h" "engine/core/controller/engine.cpp" -> "view/renderers/floatingtextrenderer.h" + "engine/core/controller/engine.cpp" -> "view/renderers/geometricrenderer.h" "engine/core/controller/engine.cpp" -> "view/renderers/gridrenderer.h" "engine/core/controller/engine.cpp" -> "view/renderers/instancerenderer.h" "engine/core/controller/engine.cpp" -> "view/renderers/quadtreerenderer.h" @@ -622,6 +623,16 @@ "engine/core/view/renderers/floatingtextrenderer.cpp" -> "view/camera.h" "engine/core/view/renderers/floatingtextrenderer.cpp" -> "view/visual.h" "engine/core/view/renderers/floatingtextrenderer.h" -> "view/rendererbase.h" + "engine/core/view/renderers/geometricrenderer.cpp" -> "geometricrenderer.h" + "engine/core/view/renderers/geometricrenderer.cpp" -> "model/metamodel/grids/cellgrid.h" + "engine/core/view/renderers/geometricrenderer.cpp" -> "model/structures/instance.h" + "engine/core/view/renderers/geometricrenderer.cpp" -> "model/structures/layer.h" + "engine/core/view/renderers/geometricrenderer.cpp" -> "model/structures/location.h" + "engine/core/view/renderers/geometricrenderer.cpp" -> "util/log/logger.h" + "engine/core/view/renderers/geometricrenderer.cpp" -> "util/math/fife_math.h" + "engine/core/view/renderers/geometricrenderer.cpp" -> "video/renderbackend.h" + "engine/core/view/renderers/geometricrenderer.cpp" -> "view/camera.h" + "engine/core/view/renderers/geometricrenderer.h" -> "view/rendererbase.h" "engine/core/view/renderers/gridrenderer.cpp" -> "gridrenderer.h" "engine/core/view/renderers/gridrenderer.cpp" -> "model/metamodel/grids/cellgrid.h" "engine/core/view/renderers/gridrenderer.cpp" -> "model/structures/instance.h"