epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix removing things in the editor when stopping standard-scrolling with RMB

Browse Source 
The cause for this was that the `HandleMouseInput` method of the `EditorViewPortController` ran before the one from the regular `ViewPortController`, thus intercepting the button press.

Switching the order of the two around fixes that, but introduced another problem, namely that the tooltips stopped working. Switching the order meant that the `ViewPortController` laid "on top" of the `EditorViewPortController`, so the latter didn't receive the `MouseEntered` event anymore. Setting the `IgnoreMouseOver` flag in the `ViewPortController` fixes this.
This commit is contained in:
Oliver Brakmann
2016-08-28 11:26:23 +02:00
parent dffb602ed4
commit d14ff2a54e
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mods/cnc/chrome/editor.yaml
View File

@@ -203,9 +203,6 @@ Container@EDITOR_WORLD_ROOT:
Logic: LoadIngamePerfLogic, MapEditorLogic Logic: LoadIngamePerfLogic, MapEditorLogic
Children: Children:
Container@PERF_ROOT: Container@PERF_ROOT:
ViewportController:
Width: WINDOW_RIGHT
Height: WINDOW_BOTTOM
EditorViewportController@MAP_EDITOR: EditorViewportController@MAP_EDITOR:
Width: WINDOW_RIGHT Width: WINDOW_RIGHT
Height: WINDOW_BOTTOM Height: WINDOW_BOTTOM
@@ -218,6 +215,10 @@ Container@EDITOR_WORLD_ROOT:
Visible: false Visible: false
ActorPreview@DRAG_ACTOR_PREVIEW: ActorPreview@DRAG_ACTOR_PREVIEW:
Visible: false Visible: false
ViewportController:
Width: WINDOW_RIGHT
Height: WINDOW_BOTTOM
IgnoreMouseOver: True
Background@RADAR_BG: Background@RADAR_BG:
X: WINDOW_RIGHT-255 X: WINDOW_RIGHT-255
Y: 5 Y: 5

10
mods/ra/chrome/editor.yaml
View File

@@ -194,12 +194,6 @@ Container@EDITOR_WORLD_ROOT:
Logic: LoadIngamePerfLogic, MapEditorLogic Logic: LoadIngamePerfLogic, MapEditorLogic
Children: Children:
Container@PERF_ROOT: Container@PERF_ROOT:
ViewportController:
X: 0
Y: 0
Width: WINDOW_RIGHT
Height: WINDOW_BOTTOM
TooltipContainer: TOOLTIP_CONTAINER
EditorViewportController@MAP_EDITOR: EditorViewportController@MAP_EDITOR:
Width: WINDOW_RIGHT Width: WINDOW_RIGHT
Height: WINDOW_BOTTOM Height: WINDOW_BOTTOM
@@ -212,6 +206,10 @@ Container@EDITOR_WORLD_ROOT:
Visible: false Visible: false
Sprite@DRAG_LAYER_PREVIEW: Sprite@DRAG_LAYER_PREVIEW:
Visible: false Visible: false
ViewportController:
Width: WINDOW_RIGHT
Height: WINDOW_BOTTOM
IgnoreMouseOver: True
Background@RADAR_BG: Background@RADAR_BG:
X: WINDOW_RIGHT-255 X: WINDOW_RIGHT-255
Y: 5 Y: 5