From 4a0d46afd52b8c3a7eb70596b02762982adba8c2 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Wed, 31 Oct 2007 14:39:53 +0000 Subject: [PATCH] ISlider theme improved. svn changeset:2638/svn branch:trunk --- .../terminal/gwt/client/ui/ISlider.java | 22 ++++---- .../default/slider/img/handle-horizontal.png | Bin 355 -> 705 bytes .../default/slider/img/handle-vertical.png | Bin 259 -> 710 bytes .../gwt/public/default/slider/slider.css | 53 ++++++++++++------ 4 files changed, 48 insertions(+), 27 deletions(-) diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java index e5532d5de9..9f090518c9 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java @@ -271,13 +271,21 @@ public class ISlider extends Widget implements Paintable, } else DOM.setStyleAttribute(handle, styleAttribute, ((int) pos) + "px"); + // Round value to resolution + if (resolution > 0) { + v = (int) (v * (double) Math.pow(10, resolution)); + v = v / (double) Math.pow(10, resolution); + } else + v = Math.round(v); + // TODO give more detailed info when dragging and do roundup DOM.setElementAttribute(handle, "title", "" + v); - - this.value = value; + + // Update value + this.value = new Double(v); if (updateToServer) - client.updateVariable(id, "value", value.doubleValue(), immediate); + client.updateVariable(id, "value", this.value.doubleValue(), immediate); } public void onBrowserEvent(Event event) { @@ -412,14 +420,6 @@ public class ISlider extends Widget implements Paintable, else if (v > max) v = max; - if (roundup) { - if (resolution > 0) { - v = (int) (v * (double) Math.pow(10, resolution)); - v = v / (double) Math.pow(10, resolution); - } else - v = Math.round(v); - } - setValue(new Double(v), animate, roundup); } diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/handle-horizontal.png b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/handle-horizontal.png index a4fc19d5ad91ccf68e00be4e078245c7f08c624a..620b86f1da6f41582221690f36b4d4fd83cc1fd9 100755 GIT binary patch delta 604 zcmV-i0;B!o0>K3#iBL{Q4GJ0x0000DNk~Le0000C0000O2m=5B0Qv0fSdk$&e*qv+ zOjJeo_xJSn_QAx($;rvg&(PlB;jpx|#>va@^77{B>A1YT(9_h!$H>pm&-?uR-{0S^ zvb4(0&dJHjvbDFgx4E#iw#LcI#mLFf(9qJ-((3K)u(P$n!NTC-;^^w@wzs(8;^V8X zu&l7M%*@Ql%FOll_NuI{x4XRYfAR9w*x0kTxbX4u($v-P@bJIE!sh7ct+2Ab!Na`2 z!SnO;)YsU~(9!Yo^5f;@!^Fk8yuIAs-{0k2hB_ zNtOYuheJ+UhJnd0no*T8+ANY=QH>#nOEWGmjw8~FjhUYzUR#UB zS~^mSo6Uk3WT~;9uz;u~Gp{a)6CZCQsVu<{aSpL=b98fdfx9g%BGfYk<~Cn1?*M<8 q+uVHugPmY*3wI6jAlq#K0R{lHQ#?#0(B5kR0000*uCiBL{Q4GJ0x0000DNk~Le000070000F2m=5B03Y8ajFBNXe*kGv zOjJeP-{Irs=hfHRud=eh#K*sSfG`XM4TRo1 zq&xqAB-$uqE~72Pkw9#0F4+@1vKr2uQSjId&!3C5-|2r6D=jbdTlLQPEz{A$W!(!{ ibo&ZNJOv;51Q-B#@(Oc-o3HQy0000%J-1+n8@87@w?8VDtCr|(W^XKS^lNT;uIdlHP$B&;bU%q_s z$k8?HH#~m&^y0;fA3uG%bMO9(SFg{WJ-cb!_RpU`Z{4>2(9vUuj~u;vnXI$4;L5^5x5ehmZChJpAC%<5zFr-oAVH(4oW6U%h(w;lswQ+qZ1rdHUS>6Q|C+ ze*bC4y1k{-*6u!e`OLjnJ8piMxAn-Wt9PG%_i_@$O>@`3|M>CeuV0_PeEIwL?~k89KYsoU6nEr) z^8^^Ci6udP!9Xre0mHh6d_$mRdpunnLn>}1d3bnCxO_!8tdrG9LP+RG#f+W077?tD zGQv-Hys$VX5nFwkg)MNN#l47o7Ht)bUs>4PpS`%zaU)}Hg>q&xTXEis9^Ksn%=0Cc zBlu@8nJdyf)tRT6&$*{UWdAk^XQtIoH8nQTQ&@z##hsfP7dH4#QMI3JqkbYtQc$3ZOq2JYD@<);T3K0RVVPz)%1H delta 214 zcmX@c+RUWb8Q|y6%O%Cdz`(%k>ERLtr1^lDor4)j^3Uwio~USE&tMSX6XN>j-TPCg zPHo?{>+HoVYu9hMeEsI7t2gf4d-(ME%L`YoJ$&-)=AC<|&tE!o=FG1B2mb&6FUl#u z0%(XpNswPKkc$i$9w^630_AKyT^vIyZpEB*mdKI;Vst E0EVY!uK)l5 diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/slider/slider.css b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/slider.css index fb9fb43e43..5b10e6a110 100644 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/slider/slider.css +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/slider.css @@ -3,24 +3,27 @@ --------------------------*/ .i-slider { - border: 1px solid #d8dbdc; - height: 2px; + border: 1px solid #cccfd0; + height: 3px; margin: 5px 0; } .i-slider-base { - height: 1px; - border-top: 1px solid #e5e8e8; - background: #fff; + height: 2px; + border-top: 1px solid #cbcdce; + background: #f3f3f4; } .i-slider-handle { - background: #babfc0 url(img/handle-horizontal.png); - width: 7px; - height: 15px; + background: transparent url(img/handle-horizontal.png); + width: 12px; + height: 12px; margin-top: -5px; font-size: 0; cursor: pointer; } +.i-slider-handle:hover { + background-position: left bottom; +} /* TODO .i-slider-bigger { background: #dde4ef url(img/arrow-right.png); @@ -55,26 +58,44 @@ -----------------*/ .i-slider-vertical { - width: 2px; + width: 3px; height: auto; margin: 0 5px; } .i-slider-vertical .i-slider-base { - width: 1px; - border-left: 1px solid #e5e8e8; - background: #fff; + width: 2px; + border-left: 1px solid #cbcdce; + background: #f3f3f4; } .i-slider-vertical .i-slider-handle { - background: #babfc0 url(img/handle-vertical.png); - width: 14px; - height: 7px; + background: transparent url(img/handle-vertical.png); + width: 12px; + height: 12px; font-size: 0; cursor: pointer; - margin-left: -7px; + margin-left: -5px; +} +.i-slider-vertical .i-slider-handle:hover { + background-position: left bottom; } .i-slider-vertical .i-slider-bigger { } .i-slider-vertical .i-slider-smaller { +} + + + +/* IE specific styles */ + +* html .i-slider, +* html .i-slider-vertical { + margin: 0; +} +* html .i-slider .i-slider-handle { + margin: -1px 0; +} +* html .i-slider-vertical .i-slider-handle { + margin: 0 -1px; } \ No newline at end of file -- 2.39.5