Revision: 4862
http://sourceforge.net/p/vexi/code/4862
Author: clrg
Date: 2016-06-18 00:21:41 +0000 (Sat, 18 Jun 2016)
Log Message:
-----------
Fix colorpicker circle being cut off at the edges.
Modified Paths:
--------------
branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/tool/colorpicker.t
Modified:
branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/tool/colorpicker.t
===================================================================
--- branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/tool/colorpicker.t
2016-06-17 23:35:53 UTC (rev 4861)
+++ branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/tool/colorpicker.t
2016-06-18 00:21:41 UTC (rev 4862)
@@ -25,19 +25,19 @@
<ui:box align="top">
<ui:box orient="vertical" shrink="true">
<ui:box>
- <ui:box fill=":.image.colorpicker" id="colorpicker"
layout="layer" shrink="true">
- <ui:box fill=":.image.colorpicker_circle" id="circle"
shrink="true"/>
+ <ui:box layout="layer" shrink="true">
+ <lay:pad padding="5">
+ <ui:box id="colorpicker" fill=":.image.colorpicker"
layout="layer" shrink="true" />
+ </lay:pad>
+ <ui:box id="circle" fill=":.image.colorpicker_circle"
shrink="true"/>
</ui:box>
- <ui:box width="5"/>
- <ui:box align="bottom" layout="layer">
+ <ui:box align="bottom" layout="layer" vshrink="true">
<wi:bevel margintop="4" thickness="2" form="down"
orient="vertical" width="34" shrink="true" id="grad_back">
<ui:box shrink="true" fill=":.image.gradient"
layout="layer" id="gradient" />
</wi:bevel>
- <ui:box shrink="true" x="0" y="0" id="marker"
fill=":.image.colorpicker_marker" />
+ <ui:box id="gradientMarker"
fill=":.image.colorpicker_marker" shrink="true" x="0" y="0" />
</ui:box>
- $gradient.marker = $marker;
</ui:box>
- <ui:box height="5"/>
<ui:box>
<wi:bevel thickness="2" form="down" width="135" height="30">
<ui:box fill="#000000" id="colorleft"><ui:box/><ui:box
id="alphaleft" display="false"/></ui:box>
@@ -242,7 +242,7 @@
const H = model.hue, S = model.saturation, V = model.value;
// set marker arrows
- $gradient.marker.y = 0 - round((V/255) * $gradient.height);
+ $gradientMarker.y = 0 - round((V/255) * $gradient.height);
// Recalculate the color from HSV, but this time with a full value
const hue6 = H/60;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are
consuming the most bandwidth. Provides multi-vendor support for NetFlow,
J-Flow, sFlow and other flows. Make informed decisions using capacity planning
reports. http://sdm.link/zohomanageengine
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
