Author: everaldo
Date: 2007-08-31 14:10:24 -0400 (Fri, 31 Aug 2007)
New Revision: 85147

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
Log:
2007-08-30  Everaldo Canuto  <[EMAIL PROTECTED]>

        * ToolBar.cs: Fix button size for non flat toolbars. Fixes #82368.

2007-08-29  Everaldo Canuto  <[EMAIL PROTECTED]>


Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-08-31 17:05:20 UTC (rev 85146)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-08-31 18:10:24 UTC (rev 85147)
@@ -1,3 +1,7 @@
+2007-08-30  Everaldo Canuto  <[EMAIL PROTECTED]>
+
+       * ToolBar.cs: Fix button size for non flat toolbars. Fixes #82368.
+
 2007-08-30  Carlos Alberto Cortez <[EMAIL PROTECTED]>
 
        * ListView.cs: Put item padding info in a single place
@@ -48,7 +52,7 @@
        * FolderBrowserDialog.cs: Set Tag of newly created node, and keep it
        up-to-date. Fixes bug #82618.
 
-2007-05-29  Everaldo Canuto  <[EMAIL PROTECTED]>
+2007-08-29  Everaldo Canuto  <[EMAIL PROTECTED]>
 
        * TextBoxBase.cs: Call CalculateDocument after changes Lines property to
        reflect document changes. Fixes #82367.

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs       
2007-08-31 17:05:20 UTC (rev 85146)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs       
2007-08-31 18:10:24 UTC (rev 85147)
@@ -970,7 +970,12 @@
                // button size to be at least large enough to show the image.
                private Size AdjustedButtonSize {
                        get {
-                               Size size = default_size.IsEmpty ? ButtonSize : 
default_size;
+                               Size size;
+
+                               if (default_size.IsEmpty || Appearance == 
ToolBarAppearance.Normal) 
+                                       size = ButtonSize;
+                               else
+                                       size = default_size;
                                
                                if (size_specified) {
                                        if (Appearance == 
ToolBarAppearance.Flat)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to