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

Merge pull request #3607 from pchote/widget-focus

Browse Source 
Split keyboard/mouse focus and use C&C world tooltips in RA/D2K.
This commit is contained in:
Matthias Mailänder
2013-07-29 10:49:11 -07:00
parent 06d65305df 206fc0ea1d
commit 8f5a1333d2
28 changed files with 363 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mods/cnc/chrome/ingame.yaml
View File

@@ -36,7 +36,10 @@ Container@INGAME_ROOT:
Y:WINDOW_BOTTOM-HEIGHT-10
Width:200
Height:200
CncWorldInteractionController@INTERACTION_CONTROLLER:
WorldInteractionController@INTERACTION_CONTROLLER:
Width:WINDOW_RIGHT
Height:WINDOW_BOTTOM
ViewportController:
Width:WINDOW_RIGHT
Height:WINDOW_BOTTOM
TooltipContainer:TOOLTIP_CONTAINER

5
mods/cnc/chrome/tooltips.yaml
View File

@@ -25,8 +25,11 @@ Background@BUTTON_TOOLTIP:
Background@WORLD_TOOLTIP:
Logic:WorldTooltipLogic
Background:panel-black
Width:141
Children:
Container@SINGLE_HEIGHT:
Height:25
Container@DOUBLE_HEIGHT:
Height:45
Label@LABEL:
X:5
Height:23

24
mods/d2k/chrome/tooltips.yaml
View File

@@ -9,6 +9,30 @@ Background@SIMPLE_TOOLTIP:
Height:23
Font:Bold
Background@WORLD_TOOLTIP:
Logic:WorldTooltipLogic
Background:dialog3
Children:
Container@SINGLE_HEIGHT:
Height:31
Container@DOUBLE_HEIGHT:
Height:56
Label@LABEL:
X:7
Y:2
Height:23
Font:Bold
Image@FLAG:
X:7
Y:27
Width:23
Height:23
Label@OWNER:
X:35
Y:25
Height:23
Font:Bold
Background@SPAWN_TOOLTIP:
Logic:SpawnSelectorTooltipLogic
Background:dialog3

4
mods/ra/chrome/ingame.yaml
View File

@@ -6,11 +6,12 @@ Container@INGAME_ROOT:
Y:0
Width:WINDOW_RIGHT
Height:WINDOW_BOTTOM
ViewportScrollController:
ViewportController:
X:0
Y:0
Width:WINDOW_RIGHT
Height:WINDOW_BOTTOM
TooltipContainer:TOOLTIP_CONTAINER
WorldCommand:
X:0
Y:0
@@ -31,7 +32,6 @@ Container@INGAME_ROOT:
Text:Options (ESC)
Font:Bold
Key: escape
WorldTooltip:
Background@PERF_BG:
ClickThrough:true
Background:dialog4

24
mods/ra/chrome/tooltips.yaml
View File

@@ -9,6 +9,30 @@ Background@SIMPLE_TOOLTIP:
Height:23
Font:Bold
Background@WORLD_TOOLTIP:
Logic:WorldTooltipLogic
Background:dialog4
Children:
Container@SINGLE_HEIGHT:
Height:29
Container@DOUBLE_HEIGHT:
Height:50
Label@LABEL:
X:7
Y:2
Height:23
Font:Bold
Image@FLAG:
X:7
Y:27
Width:32
Height:16
Label@OWNER:
X:45
Y:22
Height:23
Font:Bold
Background@SPAWN_TOOLTIP:
Logic:SpawnSelectorTooltipLogic
Background:dialog4