mirror of
https://github.com/edubart/otclient.git
synced 2025-10-17 21:13:26 +02:00
Market fixes
- Market now works after reloading - Fixed button / tab styles - MarketRightTabBarButton now inherits the base style - Fixed amountWindow buttons being hardly clickable - "All" search filter is now on by default
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
AmountWindow < MainWindow
|
||||
id: amountWindow
|
||||
!text: tr('Amount')
|
||||
size: 270 80
|
||||
size: 270 90
|
||||
|
||||
Item
|
||||
id: item
|
||||
|
@@ -4,7 +4,6 @@ MarketButtonBox < ButtonBoxRounded
|
||||
size: 106 22
|
||||
text-offset: 0 2
|
||||
text-align: center
|
||||
image-border: 2
|
||||
|
||||
$checked:
|
||||
color: white
|
||||
|
@@ -10,15 +10,9 @@ MarketTabBarButton < TabBarButton
|
||||
margin-left: 0
|
||||
|
||||
$hover !checked:
|
||||
image-clip: 0 20 20 20
|
||||
color: white
|
||||
|
||||
$disabled:
|
||||
image-color: #ffffff66
|
||||
icon-color: #888888
|
||||
color: #ffffff
|
||||
|
||||
$checked:
|
||||
image-clip: 0 20 20 20
|
||||
color: #ffffff
|
||||
|
||||
$on !checked:
|
||||
@@ -26,36 +20,24 @@ MarketTabBarButton < TabBarButton
|
||||
|
||||
MarketRightTabBar < TabBar
|
||||
MarketRightTabBarPanel < TabBarPanel
|
||||
// TODO: inherit style from TabBarButton and adjust it
|
||||
// anchors.left: none did not seem to work for me
|
||||
MarketRightTabBarButton < UIButton
|
||||
MarketRightTabBarButton < TabBarButton
|
||||
size: 20 25
|
||||
font: verdana-11px-rounded
|
||||
text-offset: 0 2
|
||||
image-source: /images/ui/tabbutton_square
|
||||
image-color: white
|
||||
image-clip: 0 0 20 20
|
||||
image-border: 3
|
||||
icon-color: white
|
||||
color: #aaaaaa
|
||||
anchors.top: parent.top
|
||||
padding: 5
|
||||
|
||||
anchors.right: prev.left
|
||||
color: #929292
|
||||
|
||||
$first:
|
||||
anchors.right: parent.right
|
||||
anchors.left: none
|
||||
|
||||
$!first:
|
||||
anchors.right: prev.left
|
||||
anchors.left: none
|
||||
|
||||
$hover !checked:
|
||||
image-clip: 0 20 20 20
|
||||
color: white
|
||||
|
||||
$disabled:
|
||||
image-color: #ffffff66
|
||||
icon-color: #888888
|
||||
color: #ffffff
|
||||
|
||||
$checked:
|
||||
image-clip: 0 20 20 20
|
||||
color: #ffffff
|
||||
|
||||
$on !checked:
|
||||
|
@@ -52,7 +52,7 @@ Panel
|
||||
|
||||
MarketButtonBox
|
||||
id: filterLevel
|
||||
checked: false
|
||||
&default: false
|
||||
!text: tr('Level')
|
||||
!tooltip: tr('Filter list to match your level')
|
||||
anchors.top: prev.bottom
|
||||
@@ -62,11 +62,10 @@ Panel
|
||||
margin-left: 3
|
||||
width: 40
|
||||
height: 20
|
||||
@onCheckChange: Market.updateCurrentItems()
|
||||
|
||||
MarketButtonBox
|
||||
id: filterVocation
|
||||
checked: false
|
||||
&default: false
|
||||
!text: tr('Voc.')
|
||||
!tooltip: tr('Filter list to match your vocation')
|
||||
anchors.top: prev.top
|
||||
@@ -75,7 +74,6 @@ Panel
|
||||
margin-left: 3
|
||||
width: 34
|
||||
height: 20
|
||||
@onCheckChange: Market.updateCurrentItems()
|
||||
|
||||
MarketComboBox
|
||||
id: slotComboBox
|
||||
@@ -90,7 +88,7 @@ Panel
|
||||
|
||||
MarketButtonBox
|
||||
id: filterDepot
|
||||
checked: false
|
||||
&default: false
|
||||
!text: tr('Show Depot Only')
|
||||
!tooltip: tr('Show your depot items only')
|
||||
anchors.top: prev.bottom
|
||||
@@ -99,7 +97,6 @@ Panel
|
||||
margin-top: 6
|
||||
margin-right: 3
|
||||
margin-left: 3
|
||||
@onCheckChange: Market.updateCurrentItems()
|
||||
|
||||
Panel
|
||||
id: itemsContainer
|
||||
@@ -152,11 +149,10 @@ Panel
|
||||
|
||||
MarketButtonBox
|
||||
id: filterSearchAll
|
||||
checked: false
|
||||
&default: true
|
||||
!text: tr('All')
|
||||
!tooltip: tr('Search all items')
|
||||
anchors.verticalCenter: prev.verticalCenter
|
||||
anchors.left: prev.right
|
||||
anchors.right: itemsContainer.right
|
||||
margin-left: 3
|
||||
@onCheckChange: Market.updateCurrentItems()
|
||||
|
Reference in New Issue
Block a user