From 3fa599317753f5bd221042c68dd71160e514f778 Mon Sep 17 00:00:00 2001 From: BeniS Date: Sat, 5 Jan 2013 20:57:31 +1300 Subject: [PATCH] Changed scrollbar style, and some other changes: * Changed the scrollbar style to look a bit nicer. * Fixed a typo in the EventDispatcher class. * Added PlayerStates to player.lua. * Minor tweak to console tab spacing. * Add unbinding key 'Ctrl+Shift+D' in the options. --- modules/client_options/options.lua | 1 + .../skins/default/images/contentpanel.png | Bin 0 -> 52442 bytes .../skins/default/images/scrollbar.png | Bin 638 -> 661 bytes .../skins/default/styles/scrollbars.otui | 5 +++-- modules/corelib/ui/uiscrollbar.lua | 21 +++++++++++++++++- modules/game_console/console.lua | 2 +- modules/gamelib/player.lua | 19 ++++++++++++++++ src/framework/core/eventdispatcher.cpp | 2 +- src/framework/core/scheduledevent.h | 2 +- src/framework/luafunctions.cpp | 2 +- 10 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 modules/client_skins/skins/default/images/contentpanel.png diff --git a/modules/client_options/options.lua b/modules/client_options/options.lua index badd2685..b8ea319f 100644 --- a/modules/client_options/options.lua +++ b/modules/client_options/options.lua @@ -124,6 +124,7 @@ end function Options.terminate() g_keyboard.unbindKeyDown('Ctrl+D') g_keyboard.unbindKeyDown('Ctrl+F') + g_keyboard.unbindKeyDown('Ctrl+Shift+D') optionsWindow:destroy() optionsWindow = nil optionsButton:destroy() diff --git a/modules/client_skins/skins/default/images/contentpanel.png b/modules/client_skins/skins/default/images/contentpanel.png new file mode 100644 index 0000000000000000000000000000000000000000..0eab48aa87fe5b8d5b2e548734587eaae0216c0c GIT binary patch literal 52442 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
XW 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ℜ>Ebf~Rj&RGoOOE1Ry+EP+OrGB(Vv^?H7(6<}q-1GR5G4;;bh#kl zph$+^>95%(jKw*0@B~|lqZo&*upH&;&Tdx9(6pF&kPhuxQmq40qZ!#>Yduq%`+JA6 zS)t}OV;mAO?-P$7qQ}EtL}xHDD=RT*A9lsvEpa18pT(Y#tS7u^VunE1`~GUu)-T*_ zaNVX8G#dXN$9E4CakWs)#&t%-GW({;nDsz$N*GveZThv##8QD05hVsnthW(qj2ek) z1e3uXSl*6=s^|Oc-;aJ@jAf>eZnhM38lW2oEFlJDibrL`T>Z+sq3lIs2|qJXGVYz5 z=W+$|z1;u4qXoUJPk8`jbiLI5A-A0mLNTX9Br?i9c`LCA=OGYL?7pyU*EJ9%v>QAN zmCffiSIbj~2qZnai>&ZCVctCS9+!CH@wcPviCC_`089OPp@4ruO{xi zlySIO4^F*el@Amc=~?3Jej|gp1%VTueQvrCYY9xEvh~Gt-%)G`>_5# zC%>_7O$o9x16nEi(4{Q;09QLU``H=z7hw5mvsq~SZd1%2SfF>hs{XwFYE0VvDF{os z)^PukFp0eq7kgkFLK_}H)8%w^6#lr&rGy#R`&Z^epnWg3UPdU{r@a(@st*1W zg_g3I4{o;f_4~0grI`R@5Vj(JXMrJ~a#NBN+y@w06RoU8qMs<0Z)EG7gx^`Yf(K z-0i>k-)y%(2#?qV*IS+kVki&r=WUvUQR_V2;d|~o-HK2Dvh$R@rAiSUJoE02f+Gk2 zzXMcZKxLxraAJ3zK-gbZ7gZ!~OwpWrgG|=3S29eQSJZ*%V7-ku7kb#mamlP6Kj08_ zARM{rXh2Io`eJvX zxu4VV7LGbg2xh=+jFt|CXgvW%^j+@6!6<#%+xU-DhC>ZRh)5fG@KEb!f2cf#&t(E-8S2cG$wDUL5%-(2{*M`s6z?n24L%v?=)5B%ssiPQw)^h6t6AT z&V}UbBq%S(9gPda8i?Rbki&#^G@yyji~b_w-AHsT>MVFH1XG0#lI0j!fsQ@Sj)x~L zr8{oyTOJ_;JN70&KXlp4QDfZ@J!uSqpc~V9=NXI~)$})hy+)&70Mo z178H_+stIebt6)1RDwDZtdOU%TKrho#dNUU`~3P9SnjBO|8u1PtqSJ(ydOBUd)SQb z%LvV6oE){B=m&_`;1UR^V(v%&J~QoIrEO9}u{Eg|yx_DcO7WDPholpSlE|34392gk zxqCyrNHnz+svn;*U(iGWZ>pT7LzxuE?;jUj-LhSe(kPt{8IEm+6Cm1Q8uMQ{cW)MO zF<7jX8`G9eY;`b8Kx?B>Ln0LZe7q641ckAauRP41Y|i*lLH62h?OH~o!w6dpXE^gA zDlUz(CX2O4BR4h!>P$nR;F28sEvMjxJv&pG)iA}!7LY5`Fqe?hrxny3&%sX5*c&ux zVuUTEjn;bK>^rRdDR8W0$^7yTq?{jKC8bIpH!pH<=4InxhcM2vFu(N8j4d;?`wH9f z-(yN*&S2B>yb;PYGDwzypk-$Y8ue9iaS<4ry&=Gx|rJ(&62+4G_W8N%|;AD%vuTrHJF9ZY3Stl^|8rFcMB zPA_I(6kZc(@cEMDY{je?Ga;}I#ITsxNOLQxxKjRd3S@3Oeq`^@I8Zbm2px9z8q81? zFMVwg4JMp)289YpeQWFAn>Iyl0~z9 zZh`*Qp;TtZt1v06;bo{=3?O|apFlVt=ITThoc9n+bTX14hfPX79CJI+j*r%A^Z)=1 z5=lfsRBygyw*f%3{OUc{P!YJlkKU|EMC~T9=p26XwX<%Xcu@fX4F2=tIAVV#Van0*L|*6 zgH(Vb$#qT{azd*mJQZCwD_14yTze0yjr30}Gf_Y! z?&itDIq_dk%p5}_Pe((UQ?`ap2iCitypqO{RhW60F{fdKqyurA)8Ybz=_+JxGM%}Y zfDP_HyGDaq&acLxTy4zD`4KbG3!g7q<;}X48i}%%-89LoLuygPoRcF}7bD@tb}N^a zj$!OQn%{CuYcR5xy(jxVad{s(k)lFH57}WO((a824aSUSKUCaBfhoky3O%eA88zJA z@%P`4Q0V6r-SlVPTcKd`)5Qry<#A3$&Il}=5LP!|s}5OC>_AEq0Oxdj-bVmvv2)V!f1?DP5Lp|6^Jm$4wrI)X?_ zIe~FKjBsLbLE!}z<>eoQq#aumacSi_iIjBY-6ugs5oa?2N%g%g$G(?@jf5*?j-q!$ z(?K{IpE4VicswS#h*}ZQtq*3Sy_^6c1H8Eq&poOtq6{rA3La)n{7|5Ecb>&B>kvv2 z7WVmH|Cia`NqZ&|h=gi}l{IvT-x-zu1oqX9gG?_RSC&2>HaD6NuHu^en2@vz1Bf8f zP=pIZu5N^~8((0tSXA(0yKU1TScf6)9re+sJpj`MvfS6mc9$8e)#6*&KV4B3zWbf`dp^Hk8ROQ@< zWH9I&#d_B-G7UZd-n*yNAm73(>YL3$c+5&s-Etw^7rFe#Aw*iehgm0bL7Gn77Ug2ca7Vw^*iTBNl^vj%SkKY=l9%d%*@VU}07YyaUvJK2RRNctV_DSF^B1 zZpI5*y?Hp+)`VmyMkuhn8W9WsENwI5On@rVfnsjrP^64s#1!zL_QyomT#Q%D26B}8 zcnh67Rje~w`m2>{<_<#4FGn%bZi1&MmWd00-d0)nap(eu!8VRlDSf&0yquFeF{nbvIwZ@@oM6oS2=W zEm$jCkG;34FCk0KqdQ5%ds>U#i`Dnx9N|1cbRXM@&O)>o%%OV=L@R3iQ0;^Ea~&|s z8HqkMz!IiS5zaT>zuy_ZUBgV~NbB4gExYq(%W>bM(~cdsJ`j>(#(@vPNVNeIjrDHe zo3Osb7a+|-Q}@N}u7v2kRwm#o!?ET%UFmmx1+*$P88&ZDG>TChnUW*Zocs=}VKLza ze8yDqTyP!IpUP0vsY2xgDk@au0L1?N@-*Ov&YFYI;%-=!qm8{egin_%aawwzaK@2O zkH6+bxIq%sBNtyMvSX7i86HUSQY};>d4K?lQ>f^W+C4L~Mt#FR%UjlL(Ic-RCsCmgf~ri+ITUc!3ew*;u>sN&*u{W8nUGp9wyiDLj+(Z z<3bchA%c9DMlf2Pbl2r1jv-^v>%lMTHcafj6#-eE)8U5BRufy1&0hn0;;aI&(8lQi zVNs$1LP1YHBM19%1nUB5x9m^Y#-P;tot7=*?RLAtu_DN*zUB%Q46es6!&w|Zq5;MA zniNqKw#|(Bp)}na*J9-fCF~&#sGPV12|gjIA$CXZVI}=+pY=IVoYeTH2JdZnS{PDAssBDV>-7FAN7JoBSi_7DNe`qC7@AGr zwsoTpK-_GwoL*}U&O?7O@?r$r0?n{mq+T?SO})&tpvFr!jwvo-1ZZytUIr5zv=fka zqmYxGdHDfOtSTdmBpXv~HhiH4Ctn}Y{PzEDt}SI+y8C!#Vm)UtX^OSO6 z-hHzwpP&v=fledjg#@tTfjlOhgO?vYzZ!WkJF?>;5yH9Cr0kelceg3e4Kpa*{^hEz z!Mkshf;BXJL2GBD1;6y+yuLy(G0t@eSKwWaC9laA+Mp2~dhmZp>vYXjOpL&eYp!VF zCo|6oowKP>Y3E_UluMX%V#NTdrD~>$&aV_>Mm=k}?q*yzC=l1@^yQ$YE15Hgjy8wj zTW(L|FW~uO3bc5x&_VHz99YH3Wmrk~4v4D?BvH=E5%3`&Ap%HvHI2!U<+@JAdlt7` zOv6u`kR$~k2r@P{ta>T1HP_-vkDIZ~)=7mJsL*hG-I%jMZH;R$KEQ{y{=3N(bb`{O zxn#5F?aBj=EYIvE^8qTUFrBiQX0zHH+A~SoV@^@$sR4*EV^%!T7Y}RWLPjsUFCEQw zF;vsI+@3}`+LGigfIyihS^WU!!ZQ(LxyCEWvG}PF^4oD6sfB10o zc$*QkBQKa(oXNnZWa0h%owsG%_su=lvUTe38td-iU8Ym;L;>zr**+P(A$KTk0)$+g zQDWSyDur16`%u9b?3BaIM|2c69>gQ1nJ3x8$bkvdr0ZCqP0==&N95kxvNi(r7uPdQRNLwC#;%)$SL)xrb13qFoWS*Iue!U*dbQAiVZ;1&?2o68hnAZE2+=SczU@9bM zPD*-`1!??|=+(_{okp%@-}Y}sVxu3+b?p{n>|=Aulx^Hz$N>+A5F%je#i<2$w=)YZyX*cE68?1d>nAwvi(|%nM`oa$=VZ}`qH~t$<9axiHU(UqBZ4L6cW|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 delta 613 zcmV-r0-F7m1^xt(B!32COGiWiApj)+C!TJMs{jB132;bRa{vGioB#k0>j7u#yzBq~ z00(qQO+^RX1quugG0`dfaR2}S9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*P zO;BVmWd{HN0pdwSK~!ko?V7=AgFq05C$gnTkz8_+9+I9y&VPM^K6;)YXX&NsCGDk$ zAVI2y^t2*&O=hOHam+s;M9A*%r_1`eI+>;OBMr1}Zexn?688U#Lr#u}C{CvQM){tI zh|lOqQ5A(Ai; zBZ1Q7h=JOjbAQ6x5F98?ju^;ydjGJhw{v0s;8%}N^>z+QlcT;uzVojAP1{ZMIg zI5nB2^JAP$+0(YaKctH#d)oeZdr{qoG&k1knYOK#YwC=oyv~TsLa8&jLXcC)DS-M_ zABhonDGo<{{=&RRC#OHuC)9D%vqI_<0%-bNNPRdty?>~Wbvcbrg-Jp@1PA6fIqF$X z6C#1>`^rF0A*a^lRMTega;j;AAqOA;0SG_<0?;+csiqC&^grbkE2l%46n5K8yu6fc z*5bF}njA4u^F62pM!L43$q@rtg$V*#{otY#$m;Ud$swotZh-TBLLWKmNx>?V>w8#S zdiX(3+g>^YIfa};PRAjoxUpJ+inv3=im*nKvuME>@PIe;2Rt_xDTSO`ky9t}t4maI z$Yns1ubnIuUZ(&EKmY;|fB*!b6Y3*%rJ>h11Q(2If>dAn00000NkvXXu0mjf>UtM= diff --git a/modules/client_skins/skins/default/styles/scrollbars.otui b/modules/client_skins/skins/default/styles/scrollbars.otui index 62c9111b..8f83159a 100644 --- a/modules/client_skins/skins/default/styles/scrollbars.otui +++ b/modules/client_skins/skins/default/styles/scrollbars.otui @@ -1,15 +1,16 @@ ScrollBarSlider < UIButton id: sliderButton anchors.centerIn: parent - size: 13 13 + size: 13 17 image-source: /images/scrollbar.png image-clip: 0 26 13 13 image-border: 2 - image-color: #ffffffff + image-color: #ffffffbb $hover: image-clip: 13 26 13 13 $pressed: image-clip: 26 26 13 13 + image-color: #ffffff99 $disabled: image-color: #ffffff66 diff --git a/modules/corelib/ui/uiscrollbar.lua b/modules/corelib/ui/uiscrollbar.lua index 519fbc87..42a29fe4 100644 --- a/modules/corelib/ui/uiscrollbar.lua +++ b/modules/corelib/ui/uiscrollbar.lua @@ -51,6 +51,15 @@ local function calcValues(self) return range, pxrange, px, offset, center end +local function updateValueDisplay(widget) + if widget == nil then return end + + if widget:getShowValue() then + local symbol = widget:getSymbol() + widget:setText(widget:getValue()..(symbol and symbol or '')) + end +end + local function updateSlider(self) local slider = self:getChildById('sliderButton') if slider == nil then return end @@ -63,6 +72,7 @@ local function updateSlider(self) slider:setWidth(px) slider:setMarginLeft(offset) end + updateValueDisplay(self) local status = (self.maximum ~= self.minimum) @@ -96,6 +106,8 @@ function UIScrollBar.create() scrollbar.step = 1 scrollbar.orientation = 'vertical' scrollbar.pixelsScroll = false + scrollbar.showValue = false + scrollbar.symbol = nil return scrollbar end @@ -105,6 +117,7 @@ function UIScrollBar:onSetup() g_mouse.bindAutoPress(self:getChildById('decrementButton'), function() self:decrement() end, 300) g_mouse.bindAutoPress(self:getChildById('incrementButton'), function() self:increment() end, 300) g_mouse.bindPressMove(self:getChildById('sliderButton'), function(mousePos, mouseMoved) parseSliderPos(self, mousePos, mouseMoved) end) + updateSlider(self) end @@ -122,6 +135,10 @@ function UIScrollBar:onStyleApply(styleName, styleNode) self:setValue(value) elseif name == 'pixels-scroll' then self.pixelsScroll = true + elseif name == 'show-value' then + self.showValue = true + elseif name == 'symbol' then + self.symbol = value end end end @@ -185,7 +202,7 @@ function UIScrollBar:onGeometryChange() end function UIScrollBar:onMouseWheel(mousePos, mouseWheel) - if mouseWheel == MouseWheelUp then + if mouseWheel == MouseWheelDown then if self.orientation == 'vertical' then self:decrement() else @@ -206,3 +223,5 @@ function UIScrollBar:getMinimum() return self.minimum end function UIScrollBar:getValue() return math.round(self.value) end function UIScrollBar:getStep() return self.step end function UIScrollBar:getOrientation() return self.orientation end +function UIScrollBar:getShowValue() return self.showValue end +function UIScrollBar:getSymbol() return self.symbol end \ No newline at end of file diff --git a/modules/game_console/console.lua b/modules/game_console/console.lua index 43163c13..350a7665 100644 --- a/modules/game_console/console.lua +++ b/modules/game_console/console.lua @@ -77,7 +77,7 @@ function init() consoleContentPanel = consolePanel:getChildById('consoleContentPanel') consoleTabBar = consolePanel:getChildById('consoleTabBar') consoleTabBar:setContentWidget(consoleContentPanel) - consoleTabBar:setTabSpacing(0) + consoleTabBar:setTabSpacing(-1) channels = {} defaultTab = addTab(tr('Default'), true) diff --git a/modules/gamelib/player.lua b/modules/gamelib/player.lua index f2b50c65..2abe6e06 100644 --- a/modules/gamelib/player.lua +++ b/modules/gamelib/player.lua @@ -1,5 +1,24 @@ -- @docclass Player +PlayerStates = { + None = 0, + Poison = 1, + Burn = 2, + Energy = 4, + Drunk = 8, + ManaShield = 16, + Paralyze = 32, + Haste = 64, + Swords = 128, + Drowning = 256, + Freezing = 512, + Dazzled = 1024, + Cursed = 2048, + PartyBuff = 4096, + PzBlock = 8192, + Pz = 16384 +} + InventorySlotOther = 0 InventorySlotHead = 1 InventorySlotNeck = 2 diff --git a/src/framework/core/eventdispatcher.cpp b/src/framework/core/eventdispatcher.cpp index 5da923e4..80dcb112 100644 --- a/src/framework/core/eventdispatcher.cpp +++ b/src/framework/core/eventdispatcher.cpp @@ -45,7 +45,7 @@ void EventDispatcher::poll() int loops = 0; for(int count = 0, max = m_scheduledEventList.size(); count < max && !m_scheduledEventList.empty(); ++count) { ScheduledEventPtr scheduledEvent = m_scheduledEventList.top(); - if(scheduledEvent->reamaningTicks() > 0) + if(scheduledEvent->remainingTicks() > 0) break; m_scheduledEventList.pop(); scheduledEvent->execute(); diff --git a/src/framework/core/scheduledevent.h b/src/framework/core/scheduledevent.h index a7fd524f..f07a9593 100644 --- a/src/framework/core/scheduledevent.h +++ b/src/framework/core/scheduledevent.h @@ -35,7 +35,7 @@ public: bool nextCycle(); int ticks() { return m_ticks; } - int reamaningTicks() { return m_ticks - g_clock.millis(); } + int remainingTicks() { return m_ticks - g_clock.millis(); } int delay() { return m_delay; } int cyclesExecuted() { return m_cyclesExecuted; } int maxCycles() { return m_maxCycles; } diff --git a/src/framework/luafunctions.cpp b/src/framework/luafunctions.cpp index d8246931..8d2d2592 100644 --- a/src/framework/luafunctions.cpp +++ b/src/framework/luafunctions.cpp @@ -191,7 +191,7 @@ void Application::registerLuaFunctions() g_lua.registerClass(); g_lua.bindClassMemberFunction("nextCycle", &ScheduledEvent::nextCycle); g_lua.bindClassMemberFunction("ticks", &ScheduledEvent::ticks); - g_lua.bindClassMemberFunction("reamaningTicks", &ScheduledEvent::reamaningTicks); + g_lua.bindClassMemberFunction("remainingTicks", &ScheduledEvent::remainingTicks); g_lua.bindClassMemberFunction("delay", &ScheduledEvent::delay); g_lua.bindClassMemberFunction("cyclesExecuted", &ScheduledEvent::cyclesExecuted); g_lua.bindClassMemberFunction("maxCycles", &ScheduledEvent::maxCycles);