Author: everaldo
Date: 2007-09-05 10:20:04 -0400 (Wed, 05 Sep 2007)
New Revision: 85362
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ComboBox.cs
Log:
* ComboBox.cs: Adjust combobox button state to reflect current state
when
back to enabled = true. Fixes first issue of #82654.
2007-09-05 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-09-05 14:09:57 UTC (rev 85361)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-09-05 14:20:04 UTC (rev 85362)
@@ -1,5 +1,10 @@
2007-09-05 Everaldo Canuto <[EMAIL PROTECTED]>
+ * ComboBox.cs: Adjust combobox button state to reflect current state
when
+ back to enabled = true. Fixes first issue of #82654.
+
+2007-09-05 Everaldo Canuto <[EMAIL PROTECTED]>
+
* Control.cs: Fix last patch regression, prevent forms to update zorder
when
setting visible property.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ComboBox.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ComboBox.cs
2007-09-05 14:09:57 UTC (rev 85361)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ComboBox.cs
2007-09-05 14:20:04 UTC (rev 85362)
@@ -1465,13 +1465,16 @@
if (show_dropdown_button) {
dc.FillRectangle (theme.ResPool.GetSolidBrush
(theme.ColorControl), button_area);
- if (!is_enabled)
- button_state = ButtonState.Inactive;
-
+ ButtonState current_state;
+ if (is_enabled)
+ current_state = button_state;
+ else
+ current_state = ButtonState.Inactive;
+
if (is_flat) {
- theme.DrawFlatStyleComboButton (dc,
button_area, button_state);
+ theme.DrawFlatStyleComboButton (dc,
button_area, current_state);
} else {
- theme.CPDrawComboButton (dc,
button_area, button_state);
+ theme.CPDrawComboButton (dc,
button_area, current_state);
}
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
