Changeset 970 for branches/eraser6/Eraser/ToolBar.cs

Timestamp:

5/2/2009 11:33:14 AM (4 years ago)

Author:

lowjoel

Message:

-Separated the ToolBar? drop-down menus from the toolbar itself - I didn't want to use the same renderer because the renderer will have to implement menu item rendering too which is what UxThemeMenuRenderer? does. But that only works on Vista+
-Fixed all the overloads for menus in UpdateControlTheme?. Menus/toolbars all use the same interface now.

File:

• branches/eraser6/Eraser/ToolBar.cs (modified) (3 diffs)

branches/eraser6/Eraser/ToolBar.cs

@@ -42 +42 @@
         }
 
-        private class EraserToolStripRenderer : UxThemeMenuRenderer
+        private class EraserToolStripRenderer : ToolStripRenderer
         {
             protected override void Initialize(ToolStrip toolStrip)
@@ -50 +50 @@
             }
 
+            protected override void InitializeItem(ToolStripItem item)
+            {
+                base.InitializeItem(item);
+            }
+
             protected override void OnRenderToolStripBackground(ToolStripRenderEventArgs e)
             {
-                if (e.ToolStrip == owner)
-                    //Draw the parent background image. This is not portable in that it will render
-                    //this code unreusable, but for the lack of anything better this will have to suffice!
-                    e.Graphics.DrawImage(Properties.Resources.BackgroundGradient,
-                        new Point(-owner.Left, -owner.Top));
-                else
-                    base.OnRenderToolStripBackground(e);
-            }
-
-            protected override void OnRenderMenuItemBackground(ToolStripItemRenderEventArgs e)
-            {
-                if (e.ToolStrip != owner)
-                    base.OnRenderMenuItemBackground(e);
+                //Draw the parent background image. This is not portable in that it will render
+                //this code unreusable, but for the lack of anything better this will have to suffice!
+                e.Graphics.DrawImage(Properties.Resources.BackgroundGradient,
+                    new Point(-owner.Left, -owner.Top));
             }
 
             protected override void OnRenderItemText(ToolStripItemTextRenderEventArgs e)
             {
-                if (e.ToolStrip != owner)
-                {
-                    base.OnRenderItemText(e);
-                    return;
-                }
-
                 Graphics g = e.Graphics;
 
@@ -111 +101 @@
             private readonly Color TextColour = Color.White;
 
+            /// <summary>
+            /// The toolstrip using this renderer.
+            /// </summary>
             private ToolStrip owner;
         }