style adjustment and fixes
* style adjustments, now window and button style * fix bug when logging on a tile with too many creatures * remove deprecated onLogin and onLogout events
@@ -1,23 +1,23 @@
|
||||
Button < UIButton
|
||||
font: verdana-11px-antialised
|
||||
color: #f0ad4dff
|
||||
size: 106 24
|
||||
size: 106 22
|
||||
text-offset: 0 0
|
||||
image-color: white
|
||||
image-source: /core_styles/styles/images/button.png
|
||||
image-border: 5
|
||||
image-color: white
|
||||
image-clip: 0 0 20 20
|
||||
image-border: 2
|
||||
padding: 5 10 5 10
|
||||
|
||||
$hover !disabled:
|
||||
image-source: /core_styles/styles/images/button_hover.png
|
||||
image-clip: 0 20 20 20
|
||||
|
||||
$pressed:
|
||||
image-clip: 0 40 20 20
|
||||
text-offset: 1 1
|
||||
image-source: /core_styles/styles/images/button_down.png
|
||||
|
||||
$disabled:
|
||||
color: #f0ad4d88
|
||||
image-color: #ffffff88
|
||||
|
||||
TabButton < UIButton
|
||||
size: 20 20
|
||||
|
@@ -40,20 +40,21 @@ ColorBox < UICheckBox
|
||||
|
||||
ButtonBox < UICheckBox
|
||||
font: verdana-11px-antialised
|
||||
color: #f0ad4dff
|
||||
size: 106 24
|
||||
color: #ffffffff
|
||||
size: 106 22
|
||||
text-offset: 0 0
|
||||
text-align: center
|
||||
image-source: /core_styles/styles/images/button.png
|
||||
image-source: /core_styles/styles/images/tabbutton.png
|
||||
image-color: white
|
||||
image-border: 5
|
||||
image-clip: 0 0 20 20
|
||||
image-border: 2
|
||||
|
||||
$hover !disabled:
|
||||
image-source: /core_styles/styles/images/button_hover.png
|
||||
image-clip: 0 20 20 20
|
||||
|
||||
$checked:
|
||||
text-offset: 1 1
|
||||
image-source: /core_styles/styles/images/button_down.png
|
||||
image-clip: 0 40 20 20
|
||||
color: #80c7f8
|
||||
|
||||
$disabled:
|
||||
color: #f0ad4d88
|
||||
|
Before Width: | Height: | Size: 825 B After Width: | Height: | Size: 409 B |
Before Width: | Height: | Size: 151 B After Width: | Height: | Size: 139 B |
Before Width: | Height: | Size: 634 B After Width: | Height: | Size: 638 B |
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 34 KiB |
@@ -3,13 +3,13 @@ Window < UIWindow
|
||||
size: 200 200
|
||||
opacity: 1
|
||||
color: white
|
||||
text-offset: 0 2
|
||||
text-offset: 0 4
|
||||
text-align: top
|
||||
image-source: /core_styles/styles/images/window.png
|
||||
image-border: 4
|
||||
image-border-top: 20
|
||||
image-border: 5
|
||||
image-border-top: 22
|
||||
opacity: 1
|
||||
padding-top: 28
|
||||
padding-top: 30
|
||||
padding-left: 16
|
||||
padding-right: 16
|
||||
padding-bottom: 16
|
||||
|
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 39 KiB |
Before Width: | Height: | Size: 758 B After Width: | Height: | Size: 763 B |
@@ -8,7 +8,6 @@ MiniWindow < UIMiniWindow
|
||||
image-source: /game/images/miniwindow.png
|
||||
image-border: 4
|
||||
image-border-top: 23
|
||||
image-border-left: 23
|
||||
image-border-bottom: 4
|
||||
focusable: false
|
||||
&minimizedHeight: 24
|
||||
|
@@ -31,7 +31,7 @@ end
|
||||
|
||||
-- public functions
|
||||
function Minimap.init()
|
||||
connect(g_game, { onLogin = Minimap.reset })
|
||||
connect(g_game, { onGameStart = Minimap.reset })
|
||||
Keyboard.bindKeyDown('Ctrl+M', Minimap.toggle)
|
||||
|
||||
minimapButton = TopMenu.addGameToggleButton('minimapButton', tr('Minimap') .. ' (Ctrl+M)', 'minimap.png', Minimap.toggle)
|
||||
@@ -46,7 +46,7 @@ function Minimap.init()
|
||||
end
|
||||
|
||||
function Minimap.terminate()
|
||||
disconnect(g_game, { onLogin = Minimap.reset })
|
||||
disconnect(g_game, { onGameStart = Minimap.reset })
|
||||
Keyboard.unbindKeyDown('Ctrl+M')
|
||||
|
||||
minimapWidget:destroy()
|
||||
|
@@ -57,7 +57,7 @@ function RuleViolation.loadReasons()
|
||||
end
|
||||
|
||||
function RuleViolation.init()
|
||||
connect(g_game, { onLogin = RuleViolation.loadReasons })
|
||||
connect(g_game, { onGMActions = RuleViolation.loadReasons })
|
||||
|
||||
ruleViolationWindow = displayUI('ruleviolation.otui')
|
||||
ruleViolationWindow:setVisible(false)
|
||||
@@ -73,7 +73,7 @@ function RuleViolation.init()
|
||||
end
|
||||
|
||||
function RuleViolation.terminate()
|
||||
disconnect(g_game, { onLogin = RuleViolation.loadReasons })
|
||||
disconnect(g_game, { onGMActions = RuleViolation.loadReasons })
|
||||
|
||||
ruleViolationWindow:destroy()
|
||||
ruleViolationWindow = nil
|
||||
|