fix label disabled colors
This commit is contained in:
parent
8ad16fec18
commit
f750920a36
|
@ -7,6 +7,9 @@ Label < UILabel
|
||||||
|
|
||||||
LargerLabel < Label
|
LargerLabel < Label
|
||||||
|
|
||||||
|
GameLabel < UILabel
|
||||||
|
font: verdana-11px-antialised
|
||||||
|
color: #aaaaaa
|
||||||
|
|
||||||
FrameCounter < UIFrameCounter
|
FrameCounter < UIFrameCounter
|
||||||
size: 68 16
|
size: 68 16
|
||||||
|
|
|
@ -14,7 +14,7 @@ ManaBar < UIProgressBar
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
|
||||||
HealthLabel < Label
|
HealthLabel < GameLabel
|
||||||
color: white
|
color: white
|
||||||
text-align: center
|
text-align: center
|
||||||
font: verdana-11px-rounded
|
font: verdana-11px-rounded
|
||||||
|
@ -23,7 +23,7 @@ HealthLabel < Label
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
margin-top: 2
|
margin-top: 2
|
||||||
|
|
||||||
ManaLabel < Label
|
ManaLabel < GameLabel
|
||||||
color: white
|
color: white
|
||||||
text-align: center
|
text-align: center
|
||||||
font: verdana-11px-rounded
|
font: verdana-11px-rounded
|
||||||
|
|
|
@ -80,7 +80,7 @@ UIWindow
|
||||||
anchors.horizontalCenter: prev.horizontalCenter
|
anchors.horizontalCenter: prev.horizontalCenter
|
||||||
margin-top: 5
|
margin-top: 5
|
||||||
|
|
||||||
Label
|
GameLabel
|
||||||
id: soul
|
id: soul
|
||||||
anchors.top: slot9.bottom
|
anchors.top: slot9.bottom
|
||||||
anchors.bottom: slot8.bottom
|
anchors.bottom: slot8.bottom
|
||||||
|
@ -94,7 +94,7 @@ UIWindow
|
||||||
source: /core_styles/images/panel_flat.png
|
source: /core_styles/images/panel_flat.png
|
||||||
border: 1
|
border: 1
|
||||||
|
|
||||||
Label
|
GameLabel
|
||||||
id: capacity
|
id: capacity
|
||||||
anchors.top: slot10.bottom
|
anchors.top: slot10.bottom
|
||||||
anchors.bottom: slot8.bottom
|
anchors.bottom: slot8.bottom
|
||||||
|
|
|
@ -118,15 +118,6 @@ local function update()
|
||||||
end
|
end
|
||||||
|
|
||||||
-- public functions
|
-- public functions
|
||||||
function Outfit.test()
|
|
||||||
local button = createWidget('Button', rootWidget)
|
|
||||||
button:setText('Set Outfit')
|
|
||||||
button:moveTo({x = 0, y = 100})
|
|
||||||
button:setWidth('100')
|
|
||||||
button:setHeight('30')
|
|
||||||
button.onClick = function() Game.openOutfitWindow() end
|
|
||||||
end
|
|
||||||
|
|
||||||
function Outfit.create(creature, outfitList)
|
function Outfit.create(creature, outfitList)
|
||||||
Outfit.destroy()
|
Outfit.destroy()
|
||||||
window = displayUI('outfit.otui', { parent = rootWidget })
|
window = displayUI('outfit.otui', { parent = rootWidget })
|
||||||
|
@ -207,8 +198,5 @@ function Outfit.previousType()
|
||||||
end
|
end
|
||||||
|
|
||||||
-- hooked events
|
-- hooked events
|
||||||
|
|
||||||
connect(Game, { onOpenOutfitWindow = Outfit.create,
|
connect(Game, { onOpenOutfitWindow = Outfit.create,
|
||||||
onLogout = Outfit.destroy })
|
onLogout = Outfit.destroy })
|
||||||
|
|
||||||
connect(Game, { onLogin = Outfit.test })
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ SkillButton < UIButton
|
||||||
margin-top: 3
|
margin-top: 3
|
||||||
margin-left: 10
|
margin-left: 10
|
||||||
margin-right: 10
|
margin-right: 10
|
||||||
|
|
||||||
@onClick: |
|
@onClick: |
|
||||||
function(self)
|
function(self)
|
||||||
local percentBar = self:getChildById('percent')
|
local percentBar = self:getChildById('percent')
|
||||||
|
@ -20,13 +20,13 @@ SkillButton < UIButton
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
SkillNameLabel < Label
|
SkillNameLabel < GameLabel
|
||||||
font: verdana-11px-monochrome
|
font: verdana-11px-monochrome
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
|
|
||||||
SkillValueLabel < Label
|
SkillValueLabel < GameLabel
|
||||||
id: value
|
id: value
|
||||||
font: verdana-11px-monochrome
|
font: verdana-11px-monochrome
|
||||||
text-align: topright
|
text-align: topright
|
||||||
|
@ -49,8 +49,8 @@ SkillPercentPanel < UIProgressBar
|
||||||
MiniWindow
|
MiniWindow
|
||||||
id: skillWindow
|
id: skillWindow
|
||||||
title: Skills
|
title: Skills
|
||||||
size: 200 220
|
size: 200 400
|
||||||
|
|
||||||
Panel
|
Panel
|
||||||
id: skillPanel
|
id: skillPanel
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
@ -59,14 +59,14 @@ MiniWindow
|
||||||
margin-left: 3
|
margin-left: 3
|
||||||
margin-right: 3
|
margin-right: 3
|
||||||
layout: verticalBox
|
layout: verticalBox
|
||||||
|
|
||||||
SkillButton
|
SkillButton
|
||||||
id: experience
|
id: experience
|
||||||
height: 15
|
height: 15
|
||||||
SkillNameLabel
|
SkillNameLabel
|
||||||
text: Experience
|
text: Experience
|
||||||
SkillValueLabel
|
SkillValueLabel
|
||||||
|
|
||||||
SkillButton
|
SkillButton
|
||||||
id: level
|
id: level
|
||||||
SkillNameLabel
|
SkillNameLabel
|
||||||
|
@ -74,42 +74,42 @@ MiniWindow
|
||||||
SkillValueLabel
|
SkillValueLabel
|
||||||
SkillPercentPanel
|
SkillPercentPanel
|
||||||
background-color: red
|
background-color: red
|
||||||
|
|
||||||
SkillButton
|
SkillButton
|
||||||
id: health
|
id: health
|
||||||
height: 15
|
height: 15
|
||||||
SkillNameLabel
|
SkillNameLabel
|
||||||
text: Hit Points
|
text: Hit Points
|
||||||
SkillValueLabel
|
SkillValueLabel
|
||||||
|
|
||||||
SkillButton
|
SkillButton
|
||||||
id: mana
|
id: mana
|
||||||
height: 15
|
height: 15
|
||||||
SkillNameLabel
|
SkillNameLabel
|
||||||
text: Mana
|
text: Mana
|
||||||
SkillValueLabel
|
SkillValueLabel
|
||||||
|
|
||||||
SkillButton
|
SkillButton
|
||||||
id: soul
|
id: soul
|
||||||
height: 15
|
height: 15
|
||||||
SkillNameLabel
|
SkillNameLabel
|
||||||
text: Soul Points
|
text: Soul Points
|
||||||
SkillValueLabel
|
SkillValueLabel
|
||||||
|
|
||||||
SkillButton
|
SkillButton
|
||||||
id: capacity
|
id: capacity
|
||||||
height: 15
|
height: 15
|
||||||
SkillNameLabel
|
SkillNameLabel
|
||||||
text: Capacity
|
text: Capacity
|
||||||
SkillValueLabel
|
SkillValueLabel
|
||||||
|
|
||||||
SkillButton
|
SkillButton
|
||||||
id: stamina
|
id: stamina
|
||||||
SkillNameLabel
|
SkillNameLabel
|
||||||
text: Stamina
|
text: Stamina
|
||||||
SkillValueLabel
|
SkillValueLabel
|
||||||
SkillPercentPanel
|
SkillPercentPanel
|
||||||
|
|
||||||
SkillButton
|
SkillButton
|
||||||
id: magiclevel
|
id: magiclevel
|
||||||
SkillNameLabel
|
SkillNameLabel
|
||||||
|
@ -124,17 +124,17 @@ MiniWindow
|
||||||
text: Fist Fighting
|
text: Fist Fighting
|
||||||
SkillValueLabel
|
SkillValueLabel
|
||||||
SkillPercentPanel
|
SkillPercentPanel
|
||||||
|
|
||||||
SkillButton
|
SkillButton
|
||||||
id: skillId1
|
id: skillId1
|
||||||
SkillNameLabel
|
SkillNameLabel
|
||||||
text: Club Fighting
|
text: Club Fighting
|
||||||
SkillValueLabel
|
SkillValueLabel
|
||||||
SkillPercentPanel
|
SkillPercentPanel
|
||||||
|
|
||||||
SkillButton
|
SkillButton
|
||||||
id: skillId2
|
id: skillId2
|
||||||
|
|
||||||
SkillNameLabel
|
SkillNameLabel
|
||||||
text: Sword Fighting
|
text: Sword Fighting
|
||||||
SkillValueLabel
|
SkillValueLabel
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
CenterLabel < Label
|
CenterLabel < GameLabel
|
||||||
font: verdana-11px-rounded
|
font: verdana-11px-rounded
|
||||||
height: 64
|
height: 64
|
||||||
text-align: center
|
text-align: center
|
||||||
|
@ -6,7 +6,7 @@ CenterLabel < Label
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
|
||||||
BottomLabel < Label
|
BottomLabel < GameLabel
|
||||||
font: verdana-11px-rounded
|
font: verdana-11px-rounded
|
||||||
height: 16
|
height: 16
|
||||||
text-align: center
|
text-align: center
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
VipListLabel < Label
|
VipListLabel < GameLabel
|
||||||
font: verdana-11px-monochrome
|
font: verdana-11px-monochrome
|
||||||
margin-left: 5
|
margin-left: 5
|
||||||
|
|
||||||
$disabled: ~
|
|
||||||
|
|
||||||
MiniWindow
|
MiniWindow
|
||||||
id: vipWindow
|
id: vipWindow
|
||||||
|
|
Loading…
Reference in New Issue