From 0c5479b031ef55498efd93c7bdd0cfdbc5f8684b Mon Sep 17 00:00:00 2001 From: Henrique Santiago Date: Mon, 27 Aug 2012 18:56:05 -0300 Subject: [PATCH] Spinbox changes --- .../skins/default/images/spinbox_down.png | Bin 0 -> 673 bytes .../skins/default/images/spinbox_up.png | Bin 0 -> 696 bytes .../skins/default/images/textedit.png | Bin 0 -> 197 bytes .../skins/default/styles/spinboxes.otui | 32 +++++++++++++++++- .../skins/default/styles/textedits.otui | 2 +- modules/corelib/ui/uispinbox.lua | 12 +++++-- .../game_interface/styles/countwindow.otui | 5 +-- src/otclient/mapio.cpp | 3 +- 8 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 modules/client_skins/skins/default/images/spinbox_down.png create mode 100644 modules/client_skins/skins/default/images/spinbox_up.png create mode 100644 modules/client_skins/skins/default/images/textedit.png diff --git a/modules/client_skins/skins/default/images/spinbox_down.png b/modules/client_skins/skins/default/images/spinbox_down.png new file mode 100644 index 0000000000000000000000000000000000000000..541abd86124c88d760ee539d23467b61c4f31e5e GIT binary patch literal 673 zcmV;S0$%-zP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01li001oQ`XX?D{00007bV*G`2iyo7 z69O-p$FErc00JRNL_t(I%azkjOB+!X#_|6dC+|sHCD>@K($*GfHx<-~O6f;&;UWt+ z;=+}mNQ5w&1YBgHf^JkqL2)B32rU7vld-WGXQxLjE$1;!)4M+1GoXEMK4_w=S97y-dbe`3bDHSt)t-SN zO=tSm^j-j|WRkp9AQp=OkhcmvNu`>nAnBd~jl`4wuifSz3WdCYc)vCUFbo5l2OZ7b zAC3ra{TfqMxpr(G8#k)>Z)_){UeuFG_r0c3ZzCfH=ij~rG8ay*C3E4_5Hygvtk&4y zEVRh%Zx;Aby}l>YAy}(Lj`!A?%nmb|9p-p%9c#5n*fau}_amRRdvHYO7Z!b)`GrO8 z9vsnkA3p^$x4_eQ1glgg8jS*AmC8IzL_u!@ne>ZS{;%uq4FKVg=@0z;``3FiVNWC$ zZk0g`sV|CR|wW9>U51`W3!$k>k4lCd4cxOhZXL4GpRJ2m5==4lZP$m?KKH8bajr(t%X*6!U&eUr^|Js?~OaK|7qte}-00000NkvXX Hu0mjf281f| literal 0 HcmV?d00001 diff --git a/modules/client_skins/skins/default/images/spinbox_up.png b/modules/client_skins/skins/default/images/spinbox_up.png new file mode 100644 index 0000000000000000000000000000000000000000..18e22529175b1619fc1b2c11ea5b5c1d6e19a4d2 GIT binary patch literal 696 zcmV;p0!RIcP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01li001oQ`XX?D{00007bV*G`2iyo7 z6Au#u2Cb6-00KBkL_t(I%dOMBYg17e2Jq*^n~DIqM2Zd+{3l=(*LZM4RX|=XE*v(ENh#;lZQ4k!IYZA=o^`^V0?gP!HU z%fsP)-ycUP{t$%_AbKAGfFvX#1gs7xs?}=mpb*dtIY0;oO!)BbEzX|52&?57gc49`9gvYu zrQmWpJNo^V&BE<+!O)8^HQMbCHELvS3W+52LJsxHpH|+Qnr*8%DubGgH#pQ+M*H@q zO~$B+807;1fW<8Jmzjv&1OTjWzBwvm0+25L#$y5|0iRy+55^Edg&kjOgt6^0KD3K-Q&*) zfqb!uSo9W>5AHW*);G2wJLHy(=cLNy>>M>sV`MbW$Y`9JrZG7?N0&E9#UCP+fJ)gL z=CIhF#(a~=Gv literal 0 HcmV?d00001 diff --git a/modules/client_skins/skins/default/images/textedit.png b/modules/client_skins/skins/default/images/textedit.png new file mode 100644 index 0000000000000000000000000000000000000000..64a7b6aab68f20fce95bf12401002a83cf32c72e GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Y)RhkE(|h2 zRq6*tjLLx`oCO|{#S9GG!XV7ZFl&wkP>{XE)7O>#4zmQWv|+cX_Hv+*tEY=&NW|f{ z*Eb3>2#By;OtxFh*%|VGuOyR_Y0ReE2ljpmlK*@v!Xs$qS);mdLDMXOdXRy_Kkw47 Y3`eH2&nkFS-VT!SboFyt=akR{02&}O%m4rY literal 0 HcmV?d00001 diff --git a/modules/client_skins/skins/default/styles/spinboxes.otui b/modules/client_skins/skins/default/styles/spinboxes.otui index 0fecee0c..b253ae1d 100644 --- a/modules/client_skins/skins/default/styles/spinboxes.otui +++ b/modules/client_skins/skins/default/styles/spinboxes.otui @@ -4,8 +4,38 @@ SpinBox < UISpinBox size: 86 20 text-offset: 0 3 text-margin: 3 - image-source: /images/panel_flat.png + image-source: /images/textedit.png image-border: 1 $disabled: color: #aaaaaa88 + + Button + id: up + size: 10 10 + image-source: /images/spinbox_up.png + image-border: 1 + image-clip: 0 0 10 10 + anchors.top: parent.top + anchors.right: parent.right + @onClick: self:getParent():up() + + $hover: + image-clip: 0 10 10 10 + $pressed: + image-clip: 0 20 10 10 + + Button + id: down + size: 10 10 + image-source: /images/spinbox_down.png + image-border: 1 + image-clip: 0 0 10 10 + anchors.bottom: parent.bottom + anchors.right: parent.right + @onClick: self:getParent():down() + + $hover: + image-clip: 0 10 10 10 + $pressed: + image-clip: 0 20 10 10 diff --git a/modules/client_skins/skins/default/styles/textedits.otui b/modules/client_skins/skins/default/styles/textedits.otui index c70aa6d4..f0d064ad 100644 --- a/modules/client_skins/skins/default/styles/textedits.otui +++ b/modules/client_skins/skins/default/styles/textedits.otui @@ -4,7 +4,7 @@ TextEdit < UITextEdit size: 86 20 text-offset: 0 3 text-margin: 3 - image-source: /images/panel_flat.png + image-source: /images/textedit.png image-border: 1 $disabled: diff --git a/modules/corelib/ui/uispinbox.lua b/modules/corelib/ui/uispinbox.lua index 20aeb48f..5bdd51ec 100644 --- a/modules/corelib/ui/uispinbox.lua +++ b/modules/corelib/ui/uispinbox.lua @@ -13,9 +13,9 @@ end function UISpinBox:onMouseWheel(mousePos, direction) if direction == MouseWheelUp then - self:setValue(self.value + 1) + self:up() elseif direction == MouseWheelDown then - self:setValue(self.value - 1) + self:down() end return true end @@ -59,6 +59,14 @@ function UISpinBox:onStyleApply(styleName, styleNode) end end +function UISpinBox:up() + self:setValue(self.value + 1) +end + +function UISpinBox:down() + self:setValue(self.value - 1) +end + function UISpinBox:setValue(value) value = math.max(math.min(self.maximum, value), self.minimum) if value == self.value then return end diff --git a/modules/game_interface/styles/countwindow.otui b/modules/game_interface/styles/countwindow.otui index 7f648052..0c51e9a1 100644 --- a/modules/game_interface/styles/countwindow.otui +++ b/modules/game_interface/styles/countwindow.otui @@ -1,17 +1,18 @@ CountWindow < MainWindow id: countWindow !text: tr('Move Stackable Item') - size: 196 112 + size: 196 122 Label !text: tr('Amount:') - width: 64 + text-auto-resize: true anchors.left: parent.left anchors.top: parent.top margin-top: 2 SpinBox id: countSpinBox + margin-left: 5 anchors.left: prev.right anchors.right: parent.right anchors.top: parent.top diff --git a/src/otclient/mapio.cpp b/src/otclient/mapio.cpp index 03e457ff..c6dc614b 100644 --- a/src/otclient/mapio.cpp +++ b/src/otclient/mapio.cpp @@ -515,7 +515,8 @@ bool Map::loadOtcm(const std::string& fileName) fin->close(); - //g_logger.debug(stdext::format("Otcm load time: %.2f seconds", loadTimer.elapsed_seconds())); + // well, this is really slow + g_logger.debug(stdext::format("Otcm load time: %.2f seconds", loadTimer.elapsed_seconds())); return true; } catch(stdext::exception& e) { g_logger.error(stdext::format("failed to load OTCM map: %s", e.what()));