Author: mhabersack
Date: 2007-06-29 15:37:27 -0400 (Fri, 29 Jun 2007)
New Revision: 81064
Modified:
trunk/moon/desklet/weather/default.xaml
trunk/moon/desklet/weather/default.xaml.cs
Log:
new close button
Modified: trunk/moon/desklet/weather/default.xaml
===================================================================
--- trunk/moon/desklet/weather/default.xaml 2007-06-29 18:55:30 UTC (rev
81063)
+++ trunk/moon/desklet/weather/default.xaml 2007-06-29 19:37:27 UTC (rev
81064)
@@ -48,15 +48,9 @@
<Image x:Name="WindIcon" Width="98" Height="98" Canvas.Left="5"
Canvas.Top="72"/>
<!-- close/drag elements -->
- <Path Stroke="#66FFFFFF" StrokeThickness="2" x:Name="desklet-close">
- <Path.Data>
- <GeometryGroup FillRule="OddEven">
- <RectangleGeometry Rect="475,8,16,16" RadiusX="3" RadiusY="3"/>
- <LineGeometry StartPoint="476,9" EndPoint="490,23"/>
- <LineGeometry StartPoint="490,9" EndPoint="476,23"/>
- </GeometryGroup>
- </Path.Data>
- </Path>
+ <Polygon x:Name="desklet-close" Canvas.Left="475" Canvas.Top="8"
+ 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" />
<!-- station id -->
<TextBlock x:Name="StationIDLabel" Canvas.Left="100" Canvas.Top="8"
FontSize="14" FontWeight="Bold" Foreground="#66FFFFFF"
Modified: trunk/moon/desklet/weather/default.xaml.cs
===================================================================
--- trunk/moon/desklet/weather/default.xaml.cs 2007-06-29 18:55:30 UTC (rev
81063)
+++ trunk/moon/desklet/weather/default.xaml.cs 2007-06-29 19:37:27 UTC (rev
81064)
@@ -92,7 +92,7 @@
Canvas temperaturePanel;
Canvas cloudsPanel;
Canvas windPanel;
-
+
System.Windows.Controls.Image weatherIcon;
System.Windows.Controls.Image windIcon;
Ellipse windIndicator;
@@ -108,7 +108,7 @@
Storyboard show_updating;
Storyboard hide_updating;
- Path closeButton;
+ Polygon closeButton;
bool allControlsPresent= true;
string iconsDir;
@@ -121,6 +121,9 @@
double windIconTop;
double windIconLeft;
+ Brush buttonHilite = new SolidColorBrush (Color.FromArgb (0xAA,
0xFF, 0xFF, 0xFF));
+ Brush buttonNormal = new SolidColorBrush (Color.FromArgb (0x66,
0xFF, 0xFF, 0xFF));
+
GConfConfigStorage config = new GConfConfigStorage ("Weather",
0);
public void DownloadComplete (Downloader downloader)
@@ -542,7 +545,7 @@
updCanvas = LoadControl ("UpdatingCanvas") as Canvas;
cloudsPanel = LoadControl ("CloudsVisPanel") as Canvas;
loadingMessage = LoadControl ("LoadingMessage") as
TextBlock;
- closeButton = LoadControl ("desklet-close") as Path;
+ closeButton = LoadControl ("desklet-close") as Polygon;
skyConditions = LoadControl ("SkyConditions") as
TextBlock;
windPanel = LoadControl ("WindPanel") as Canvas;
windConditions = LoadControl ("WindConditions") as
TextBlock;
@@ -571,14 +574,14 @@
}
}
- void HighlightButton (Path button)
+ void HighlightButton (Polygon button)
{
- button.Stroke=new SolidColorBrush (Color.FromArgb
(0xAA, 0xFF, 0xFF, 0xFF));
+ button.Stroke = buttonHilite;
}
- void UnhighlightButton (Path button)
+ void UnhighlightButton (Polygon button)
{
- button.Stroke=new SolidColorBrush (Color.FromArgb
(0x66, 0xFF, 0xFF, 0xFF));
+ button.Stroke = buttonNormal;
}
public void Page_Loaded (object sender, EventArgs e)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
