Author: mhabersack
Date: 2007-06-29 15:48:10 -0400 (Fri, 29 Jun 2007)
New Revision: 81065
Modified:
trunk/moon/desklet/calculator/Makefile
trunk/moon/desklet/calculator/calculator.cs
trunk/moon/desklet/calculator/default.xaml
Log:
close button added
Modified: trunk/moon/desklet/calculator/Makefile
===================================================================
--- trunk/moon/desklet/calculator/Makefile 2007-06-29 19:37:27 UTC (rev
81064)
+++ trunk/moon/desklet/calculator/Makefile 2007-06-29 19:48:10 UTC (rev
81065)
@@ -1,4 +1,8 @@
DESKLET = calculator
SOURCES = calculator.cs
+EXTRA_ASSEMBLIES=../desklets.dll
include ../rules.make
+
+postcompile:
+ cp -a ../desklets.dll bin/
Modified: trunk/moon/desklet/calculator/calculator.cs
===================================================================
--- trunk/moon/desklet/calculator/calculator.cs 2007-06-29 19:37:27 UTC (rev
81064)
+++ trunk/moon/desklet/calculator/calculator.cs 2007-06-29 19:48:10 UTC (rev
81065)
@@ -53,8 +53,15 @@
public TextBlock buttonClearT;
public TextBlock Result;
+ Polygon closeButton;
+
+ Brush buttonHilite = new SolidColorBrush (Color.FromArgb (0xAA,
0xFF, 0xFF, 0xFF));
+ Brush buttonNormal = new SolidColorBrush (Color.FromArgb (0x66,
0xFF, 0xFF, 0xFF));
+
public void PageLoaded (object o, EventArgs e)
{
+ Mono.Desklets.Desklet.SetupToolbox (this);
+
button9 = FindName ("9ButtonFrame") as Shape;
button8 = FindName ("8ButtonFrame") as Shape;
button7 = FindName ("7ButtonFrame") as Shape;
@@ -91,6 +98,15 @@
buttonEqualT = FindName ("EqualButton") as TextBlock;
buttonClearT = FindName ("Clear") as TextBlock;
+ closeButton = FindName ("desklet-close") as Polygon;
+ closeButton.MouseEnter += delegate {
+ HighlightButton (closeButton);
+ };
+
+ closeButton.MouseLeave += delegate {
+ UnhighlightButton (closeButton);
+ };
+
Result = FindName ("ResultFrame") as TextBlock;
this.MouseEvents ();
@@ -106,6 +122,16 @@
sb.Begin ();
}
+ void HighlightButton (Polygon button)
+ {
+ button.Stroke = buttonHilite;
+ }
+
+ void UnhighlightButton (Polygon button)
+ {
+ button.Stroke = buttonNormal;
+ }
+
private void Method (string str, bool op)
{
if (!isRunning) return;
Modified: trunk/moon/desklet/calculator/default.xaml
===================================================================
--- trunk/moon/desklet/calculator/default.xaml 2007-06-29 19:37:27 UTC (rev
81064)
+++ trunk/moon/desklet/calculator/default.xaml 2007-06-29 19:48:10 UTC (rev
81065)
@@ -2,12 +2,17 @@
<Canvas xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation";
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml";
x:Class="Desklet.Calculator;assembly=bin/calculator.dll"
Loaded="PageLoaded"
- Width="165" Height="220">
+ Width="185" Height="220">
<Canvas.Resources>
<Storyboard x:Name="run" />
</Canvas.Resources>
+ <!-- close/drag elements -->
+ <Polygon x:Name="desklet-close" Canvas.Left="165" Canvas.Top="2"
+ Points="4 4 8 8 4 12 6 14 10 10 14 14 16 12 12 8 16 4 14 2 10
6 6 2 4 4"
+ Stroke="#66FFFFFF" StrokeThickness="3" Fill="#66FFFFFF" />
+
<Rectangle
Fill="#22000000"
Stroke="Blue"
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
