From 6d456994f481190a1b3f18fbbf86580eb4cdecd0 Mon Sep 17 00:00:00 2001
From: Henrique Santiago <henrique_santiago93@hotmail.com>
Date: Tue, 19 Feb 2013 21:34:06 -0300
Subject: [PATCH] Fix scrollbar

---
 data/images/ui/scrollbar.png       | Bin 661 -> 646 bytes
 data/locales/pt.lua                |   3 +++
 data/styles/10-scrollbars.otui     |  12 +++++++++++-
 modules/corelib/ui/uiscrollbar.lua |  11 +++++++++--
 modules/game_npctrade/npctrade.lua |  24 ++++++++----------------
 5 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/data/images/ui/scrollbar.png b/data/images/ui/scrollbar.png
index 3d0b6af15de17d45a004821cb5955b547b89b1a8..4d87786c6aa581176adb6754c3a314f4e5f9a4be 100644
GIT binary patch
delta 621
zcmV-z0+Rie1%?HXB!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA
z00(qQO+^RY0u%rr51J|^_5c6^6G=otRA}Dqn!!%OKomt^n;O#?!iGh40j`j>U*M<n
z1*{u4Vi(v&T^K@$V1f%Xq`|hl`>fKz`;sP*FmpMbW_mi)V1JMdchb?ixQr#f>ZyOf
zUM(dO5s7<!eWT@@h=?SkvARwE{J8&v+S<OaO(!98A3io4xbb$g?cAt_a%NQvw3w%G
zXX$JTx3T2FKrRFcb1(>$B?ksN>|7Ie2%&+p<iJ3#)0^AL{x}xq{`}<rVSgNhvgDXY
z$aP-#y{a5U-GBG0vgBwg7$n18-0Q2SZFhf2Mq~A~{rd7`x(``ytp8`)_O+t2&LHJ<
z1~Lny&Txb%r<79ywW~ge5!We>Mty$6yw6Tfzo}1E$7Ro|QlBb-vd>kik0z%T_3>R!
z!=^AK#6f6aev)IJ<t!lxOxq(vIrT<Pi#!XE21T9)e}C1+G(v9L*49A2mW~lQ6_Fh(
zr`9EE$|>cPKm;NXfe1vP22&{VEO0slIu_gp(U~I8g6q*8tUm#_^|^A|p-EvePvPaI
zbT)-|!!0>5P<bB|fkD?6EIBZcuP~KBzP@l#3*_taRpTXRd2c}TenJ~L=1IX<sHpAB
z;?$QPS7uHRbp|pEZtELIh;r(iocbuGys`QM6>2XHUxYP8&Y};-zz4jpKj1~@BBhj5
zU*t4G{OT07UM(>oWU1AM;&uvw2t*(P5r{wpYEU24mAYP^3eco{%;T_e00000NkvXX
Hu0mjfh(#Kf

delta 636
zcmV-?0)zdA1(gMmB!2{RLP=Bz2nYy#2xN!=00K-&L_t(&f$f^lPQpMC#;0b{G=^}H
zL*-CBA!nb!N9PGRH(o>z$N>+A5F%je#i<2$w=)YZyX*cE68?1d>nAw<m?i2aX%3ds
zx``paZIh2*ua+PH0OEFsUbOrK0Dz=FAlJ;_UWyZ>vi(|<kAE#A@Xl_tVHa;VTO-jr
zxw`ZToExQ~*(75xmW@a38WSBIQbQ=h5koT^Qzkl992q)XoFaB;f?~=<hr*sAT(tKv
zEN)d|c=E%i=i*j=UWSPdm7{kE7gs%&fhJUsWtiwth`LFd$L$WeZR7PJ=?}<l`{Vr;
z0QlD-lMCzrX@A?UA^`s43<r!e98BX32S4AT5Kd7vgwy)*+mI@HP@)g@c~c!K-i6bn
z=p$RWoU>%nM`oa$=VZ}`qH~t$<9axiHU(UqBZ4L<W=_$mLfPd^L^x(n(b3^u+x9P<
zF6PsSQ?Qs%qo!&&$0MSfq&X*O0zeMH3#V9fm!#|(E`LQhh3_4^xOGiW&rRW7QwWA^
zCm6DwV90iYA=?qZnTZ@TN*Sy6n*07EJN`srTR%)rn?>6cW|NFPUdqNJ_HMX|j*7}{
zea?6O@_s876CEAeZGG3w01zgp6m0mx1yVU^q+rAN3egT4Ie$gU?-S0UQ$^*V(KS;-
z_o9m*KXw1YDS&5_)7ljpCWO;HQCGsLi=h+=7gilMm?CvKmjWxvkV}ane8E#;gBbut
zICbeGc8H(R$ER>AIQi-ltXE6c@q#mIbph}Ghk_y735IMZ7_yyU$acIlB)D10c76bJ
Wm7pCN`s?BV0000<MNUMnLSTX%upy%W

diff --git a/data/locales/pt.lua b/data/locales/pt.lua
index 1f73d4c2..fa759795 100644
--- a/data/locales/pt.lua
+++ b/data/locales/pt.lua
@@ -5,6 +5,7 @@ locale = {
 
   -- As traduções devem vir sempre em ordem alfabética.
   translation = {
+    ["%d of experience per hour"] = "%d de experiência por hora",
     ["%s of experience left"] = "%s de experiência faltando",
     ["%s: (use object on target)"] = "%s: (usar objeto no alvo)",
     ["%s: (use object on yourself)"] = "%s: (usar objeto em si)",
@@ -221,6 +222,7 @@ locale = {
     ["Name Report + Banishment"] = "Reportar Nome + Banimento",
     ["Name Report"] = "Reportar Nome",
     ["Name"] = "Nome",
+    ["Next level in %d hours and %d minutes"] = "Próximo nível em %d horas e %d minutos",
     ["No graphics card detected, everything will be drawn using the CPU,\nthus the performance will be really bad.\nPlease update your graphics driver to have a better performance."] = false,
     ["No item selected."] = "Nenhum item selecionado",
     ["No Mount"] = "Sem montaria",
@@ -287,6 +289,7 @@ locale = {
     ["Select object"] = "Selecionar objeto",
     ["Select Outfit"] = "Selecionar Roupa",
     ["Select your language"] = "Selecione sua língua",
+    ["Sell All"] = "Vender Todos",
     ["Sell Now"] = "Vender agora",
     ["Sell Offers"] = "Ofertas de venda",
     ["Sell"] = "Vender",
diff --git a/data/styles/10-scrollbars.otui b/data/styles/10-scrollbars.otui
index d1be947c..f11dd71b 100644
--- a/data/styles/10-scrollbars.otui
+++ b/data/styles/10-scrollbars.otui
@@ -5,7 +5,7 @@ ScrollBarSlider < UIButton
   image-source: /images/ui/scrollbar
   image-clip: 0 26 13 13
   image-border: 2
-  image-color: #ffffffbb
+  image-color: #ffffffff
   $hover:
     image-clip: 13 26 13 13
   $pressed:
@@ -14,6 +14,12 @@ ScrollBarSlider < UIButton
   $disabled:
     image-color: #ffffff66
 
+ScrollBarValueLabel < Label
+  id: valueLabel
+  anchors.fill: parent
+  color: white
+  text-align: center
+
 VerticalScrollBar < UIScrollBar
   orientation: vertical
   width: 13
@@ -55,6 +61,8 @@ VerticalScrollBar < UIScrollBar
 
   ScrollBarSlider
 
+  ScrollBarValueLabel
+
 HorizontalScrollBar < UIScrollBar
   orientation: horizontal
   height: 13
@@ -97,3 +105,5 @@ HorizontalScrollBar < UIScrollBar
       image-color: #ffffff66
 
   ScrollBarSlider
+
+  ScrollBarValueLabel
diff --git a/modules/corelib/ui/uiscrollbar.lua b/modules/corelib/ui/uiscrollbar.lua
index a9b3fca3..3d317d84 100644
--- a/modules/corelib/ui/uiscrollbar.lua
+++ b/modules/corelib/ui/uiscrollbar.lua
@@ -55,8 +55,9 @@ local function updateValueDisplay(widget)
   if widget == nil then return end
 
   if widget:getShowValue() then
+    local valueLabel = widget:getChildById('valueLabel')
     local symbol = widget:getSymbol()
-    widget:setText(widget:getValue()..(symbol and symbol or ''))
+    valueLabel:setText(widget:getValue() .. (symbol or ''))
   end
 end
 
@@ -171,7 +172,10 @@ end
 
 function UIScrollBar:setMaximum(maximum)
   if maximum == self.maximum then return end
-  self.maximum  = maximum
+  self.maximum = maximum
+  if self.minimum > maximum then
+    self:setMinimum(maximum)
+  end
   if self.value > maximum then
     self:setValue(maximum)
   else
@@ -182,6 +186,9 @@ end
 function UIScrollBar:setMinimum(minimum)
   if minimum == self.minimum then return end
   self.minimum = minimum
+  if self.maximum < minimum then
+    self:setMaximum(minimum)
+  end
   if self.value < minimum then
     self:setValue(minimum)
   else
diff --git a/modules/game_npctrade/npctrade.lua b/modules/game_npctrade/npctrade.lua
index f79ae77a..9a39931e 100644
--- a/modules/game_npctrade/npctrade.lua
+++ b/modules/game_npctrade/npctrade.lua
@@ -127,6 +127,10 @@ function onItemBoxChecked(widget)
     selectedItem = item
     refreshItem(item)
     tradeButton:enable()
+
+    if getCurrentTradeType() == SELL then
+      quantityScroll:setValue(quantityScroll:getMaximum())
+    end
   end
 end
 
@@ -225,7 +229,8 @@ function clearSelectedItem()
   weightLabel:clearText()
   priceLabel:clearText()
   tradeButton:disable()
-  quantityScroll:setMaximum(1)
+  quantityScroll:setMinimum(0)
+  quantityScroll:setMaximum(0)
   if selectedItem then
     radioItems:selectWidget(nil)
     selectedItem = nil
@@ -293,22 +298,10 @@ function refreshItem(item)
     end
     local priceMaxCount = math.floor(playerMoney / getItemPrice(item, true))
     local finalCount = math.max(0, math.min(getMaxAmount(), math.min(priceMaxCount, capacityMaxCount)))
+    quantityScroll:setMinimum(1)
     quantityScroll:setMaximum(finalCount)
-
-    if quantityScroll:getValue() > finalCount then
-      quantityScroll:setValue(finalCount)
-    end
   else
-    local removeAmount = 0
-    if ignoreEquipped:isChecked() then
-      local localPlayer = g_game.getLocalPlayer()
-      for i=1,LAST_INVENTORY do
-        local inventoryItem = localPlayer:getInventoryItem(i)
-        if inventoryItem and inventoryItem:getId() == item.ptr:getId() then
-          removeAmount = removeAmount + inventoryItem:getCount()
-        end
-      end
-    end
+    quantityScroll:setMinimum(1)
     quantityScroll:setMaximum(math.max(0, math.min(getMaxAmount(), getSellQuantity(item.ptr))))
   end
 
@@ -481,7 +474,6 @@ function sellAll()
     local amount = getSellQuantity(item)
     if amount > 0 then
       g_game.sellItem(item, amount, ignoreEquipped:isChecked())
-      print(amount)
     end
   end
 end