Revision: 4738
http://sourceforge.net/p/vexi/code/4738
Author: clrg
Date: 2014-10-03 00:33:51 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
Visual fix. Today's date circle effect was being cut off if on the top/bottom
rows.
Modified Paths:
--------------
branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/datepicker.t
Modified:
branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/datepicker.t
===================================================================
---
branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/datepicker.t
2014-10-03 00:31:15 UTC (rev 4737)
+++
branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/datepicker.t
2014-10-03 00:33:51 UTC (rev 4738)
@@ -9,77 +9,77 @@
<role:focusable />
<util:date />
- <ui:Box orient="vertical">
- <ui:Box fill="white" vshrink="true">
- <button id="decmonth" focusable="false" hshrink="true">
- <lay:pad padding="4 3"><ui:Box fill=":image.arrowleft"
/></lay:pad>
- </button>
- <ui:Box id="month" />
- <button id="incmonth" focusable="false" hshrink="true">
- <lay:pad padding="4 3"><ui:Box fill=":image.arrowright"
/></lay:pad>
- </button>
- <button id="decyear" focusable="false" hshrink="true">
- <lay:pad padding="4 3"><ui:Box fill=":image.arrowleft"
/></lay:pad>
- </button>
- <ui:Box id="year" />
- <button id="incyear" focusable="false" hshrink="true">
- <lay:pad padding="4 3"><ui:Box fill=":image.arrowright"
/></lay:pad>
- </button>
- <button id="close" focusable="false" hshrink="true">
- <lay:pad padding="4 2"><ui:Box fill=":image.close" /></lay:pad>
- </button>
+ <ui:Box align="topleft" layout="layer">
+ <ui:Box orient="vertical">
+ <ui:Box fill="white" vshrink="true">
+ <button id="decmonth" focusable="false" hshrink="true">
+ <lay:pad padding="4 3"><ui:Box fill=":image.arrowleft"
/></lay:pad>
+ </button>
+ <ui:Box id="month" />
+ <button id="incmonth" focusable="false" hshrink="true">
+ <lay:pad padding="4 3"><ui:Box fill=":image.arrowright"
/></lay:pad>
+ </button>
+ <button id="decyear" focusable="false" hshrink="true">
+ <lay:pad padding="4 3"><ui:Box fill=":image.arrowleft"
/></lay:pad>
+ </button>
+ <ui:Box id="year" />
+ <button id="incyear" focusable="false" hshrink="true">
+ <lay:pad padding="4 3"><ui:Box fill=":image.arrowright"
/></lay:pad>
+ </button>
+ <button id="close" focusable="false" hshrink="true">
+ <lay:pad padding="4 2"><ui:Box fill=":image.close"
/></lay:pad>
+ </button>
+ </ui:Box>
+ <ui:Box fill="black" height="1" vshrink="true" />
+ <ui:Box height="5">
+ <ui:Box fill="#dedede" />
+ <ui:Box />
+ <ui:Box />
+ <ui:Box />
+ <ui:Box />
+ <ui:Box />
+ <ui:Box fill="#dedede" />
+ </ui:Box>
+ <ui:Box vshrink="true">
+ <ui:Box text="S" textcolor="#888888" fill="#dedede" />
+ <ui:Box text="M" textcolor="#888888" />
+ <ui:Box text="T" textcolor="#888888" />
+ <ui:Box text="W" textcolor="#888888" />
+ <ui:Box text="T" textcolor="#888888" />
+ <ui:Box text="F" textcolor="#888888" />
+ <ui:Box text="S" textcolor="#888888" fill="#dedede" />
+ </ui:Box>
+ <ui:Box height="5">
+ <ui:Box fill="#dedede" />
+ <ui:Box />
+ <ui:Box />
+ <ui:Box />
+ <ui:Box />
+ <ui:Box />
+ <ui:Box fill="#dedede" />
+ </ui:Box>
+ <ui:Box fill="black" height="1" vshrink="true" />
+ <ui:Box height="5">
+ <ui:Box fill="#dedede" />
+ <ui:Box />
+ <ui:Box />
+ <ui:Box />
+ <ui:Box />
+ <ui:Box />
+ <ui:Box fill="#dedede" />
+ </ui:Box>
+ <lay:grid id="dategrid" cols="7" />
+ <ui:Box height="5">
+ <ui:Box fill="#dedede" />
+ <ui:Box />
+ <ui:Box />
+ <ui:Box />
+ <ui:Box />
+ <ui:Box />
+ <ui:Box fill="#dedede" />
+ </ui:Box>
</ui:Box>
- <ui:Box fill="black" height="1" vshrink="true" />
- <ui:Box height="5">
- <ui:Box fill="#dedede" />
- <ui:Box />
- <ui:Box />
- <ui:Box />
- <ui:Box />
- <ui:Box />
- <ui:Box fill="#dedede" />
- </ui:Box>
- <ui:Box vshrink="true">
- <ui:Box text="S" textcolor="#888888" fill="#dedede" />
- <ui:Box text="M" textcolor="#888888" />
- <ui:Box text="T" textcolor="#888888" />
- <ui:Box text="W" textcolor="#888888" />
- <ui:Box text="T" textcolor="#888888" />
- <ui:Box text="F" textcolor="#888888" />
- <ui:Box text="S" textcolor="#888888" fill="#dedede" />
- </ui:Box>
- <ui:Box height="5">
- <ui:Box fill="#dedede" />
- <ui:Box />
- <ui:Box />
- <ui:Box />
- <ui:Box />
- <ui:Box />
- <ui:Box fill="#dedede" />
- </ui:Box>
- <ui:Box fill="black" height="1" vshrink="true" />
- <ui:Box height="5">
- <ui:Box fill="#dedede" />
- <ui:Box />
- <ui:Box />
- <ui:Box />
- <ui:Box />
- <ui:Box />
- <ui:Box fill="#dedede" />
- </ui:Box>
- <ui:Box id="base" align="topleft" layout="layer">
- <lay:grid id="dategrid" cols="7" />
- <ui:Box id="circle" display="false" fill=":image.datecircle"
shrink="true" />
- </ui:Box>
- <ui:Box height="5">
- <ui:Box fill="#dedede" />
- <ui:Box />
- <ui:Box />
- <ui:Box />
- <ui:Box />
- <ui:Box />
- <ui:Box fill="#dedede" />
- </ui:Box>
+ <ui:Box id="circle" display="false" fill=":image.datecircle"
shrink="true" />
/**
* required because mouse press on the popbox would
@@ -108,7 +108,7 @@
var today; // vexi.js.Date
var circleToday = function() {
var today_box = $dategrid[showweekday + today.day - 1];
- var d = $base.distanceto(today_box);
+ var d = distanceto(today_box);
$circle.x = d.x - 2;
$circle.y = d.y - 8;
$circle.display = true;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
