//
//
-
using System.Drawing;
using System.ComponentModel;
using System.Drawing.Imaging;
using System.Drawing.Drawing2D;
+using System.Runtime.InteropServices;
namespace System.Windows.Forms
{
[DefaultProperty ("Value")]
- public sealed class ProgressBar : Control
+ [DefaultBindingProperty ("Value")]
+ [ClassInterface (ClassInterfaceType.AutoDispatch)]
+ [ComVisible (true)]
+ public class ProgressBar : Control
{
#region Local Variables
private int maximum;
private int minimum;
internal int step;
internal int val;
+ internal DateTime start = DateTime.Now;
internal Rectangle client_area = new Rectangle ();
-#if NET_2_0
internal ProgressBarStyle style;
-#endif
+ Timer marquee_timer;
+ bool right_to_left_layout;
+ private static readonly Color defaultForeColor = SystemColors.Highlight;
#endregion // Local Variables
#region events
- [Browsable (false)]
- [EditorBrowsable (EditorBrowsableState.Never)]
- public new event EventHandler BackColorChanged {
- add { base.BackColorChanged += value; }
- remove { base.BackColorChanged -= value; }
- }
+ static object RightToLeftLayoutChangedEvent = new object ();
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
remove { base.BackgroundImageChanged -= value; }
}
+ [Browsable(false)]
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public new event EventHandler BackgroundImageLayoutChanged {
+ add { base.BackgroundImageLayoutChanged += value; }
+ remove { base.BackgroundImageLayoutChanged -= value; }
+ }
+
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
public new event EventHandler CausesValidationChanged {
remove { base.FontChanged -= value; }
}
- [Browsable (false)]
- [EditorBrowsable (EditorBrowsableState.Never)]
- public new event EventHandler ForeColorChanged {
- add { base.ForeColorChanged += value; }
- remove { base.ForeColorChanged -= value; }
- }
-
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
public new event EventHandler ImeModeChanged {
remove { base.Leave -= value; }
}
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ [Browsable(false)]
+ public new event MouseEventHandler MouseDoubleClick {
+ add { base.MouseDoubleClick += value; }
+ remove { base.MouseDoubleClick -= value; }
+ }
+
+ [Browsable(false)]
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public new event EventHandler PaddingChanged {
+ add { base.PaddingChanged += value; }
+ remove { base.PaddingChanged -= value; }
+ }
+
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
public new event PaintEventHandler Paint {
remove { base.Paint -= value; }
}
- [Browsable (false)]
- [EditorBrowsable (EditorBrowsableState.Never)]
- public new event EventHandler RightToLeftChanged {
- add { base.RightToLeftChanged += value; }
- remove { base.RightToLeftChanged -= value; }
+ public event EventHandler RightToLeftLayoutChanged {
+ add { Events.AddHandler (RightToLeftLayoutChangedEvent, value); }
+ remove { Events.RemoveHandler (RightToLeftLayoutChangedEvent, value); }
}
[Browsable (false)]
SetStyle (ControlStyles.UserPaint |
ControlStyles.Selectable |
ControlStyles.ResizeRedraw |
- ControlStyles.Opaque, false);
+ ControlStyles.Opaque |
+ ControlStyles.UseTextForAccessibility
+ , false);
+
+ force_double_buffer = true;
+
+ ForeColor = defaultForeColor;
}
#endregion // Public Constructors
}
}
- // Setting this property in MS .Net 1.1 does not have any visual effect and it
- // does not fire a BackColorChanged event
- [Browsable (false)]
- [EditorBrowsable (EditorBrowsableState.Never)]
- public override Color BackColor
- {
- get { return base.BackColor; }
- set { base.BackColor = value; }
- }
-
// Setting this property in MS .Net 1.1 does not have any visual effect and it
// does not fire a BackgroundImageChanged event
[Browsable (false)]
set { base.BackgroundImage = value; }
}
+ [Browsable(false)]
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public override ImageLayout BackgroundImageLayout {
+ get { return base.BackgroundImageLayout; }
+ set { base.BackgroundImageLayout = value; }
+ }
+
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
public new bool CausesValidation
get { return ThemeEngine.Current.ProgressBarDefaultSize; }
}
- // Setting this property in MS .Net 1.1 does not have any visual effect and it
- // does not fire a FontChanged event
- [Browsable (false)]
- [EditorBrowsable (EditorBrowsableState.Never)]
- public override Font Font
- {
- get { return base.Font; }
- set { base.Font = value; }
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ protected override bool DoubleBuffered {
+ get { return base.DoubleBuffered; }
+ set { base.DoubleBuffered = value; }
}
// Setting this property in MS .Net 1.1 does not have any visual effect and it
// does not fire a FontChanged event
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public override Color ForeColor
+ public override Font Font
{
- get { return base.ForeColor; }
- set { base.ForeColor = value; }
+ get { return base.Font; }
+ set { base.Font = value; }
}
[Browsable (false)]
}
set {
if (value < 0)
- throw new ArgumentException(
+ throw new ArgumentOutOfRangeException ("Maximum",
string.Format("Value '{0}' must be greater than or equal to 0.", value ));
maximum = value;
+ minimum = Math.Min (minimum, maximum);
+ val = Math.Min (val, maximum);
Refresh ();
}
}
}
set {
if (value < 0)
- throw new ArgumentException(
+ throw new ArgumentOutOfRangeException ("Minimum",
string.Format("Value '{0}' must be greater than or equal to 0.", value ));
minimum = value;
+ maximum = Math.Max (maximum, minimum);
+ val = Math.Max (val, minimum);
Refresh ();
}
}
- [Browsable (false)]
- [EditorBrowsable (EditorBrowsableState.Never)]
- public override RightToLeft RightToLeft
- {
- get { return base.RightToLeft; }
- set { base.RightToLeft = value; }
+ [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+ [Browsable(false)]
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public new Padding Padding {
+ get { return base.Padding; }
+ set { base.Padding = value; }
+ }
+
+ [Localizable(true)]
+ [DefaultValue(false)]
+ [MonoTODO ("RTL is not supported")]
+ public virtual bool RightToLeftLayout {
+ get { return right_to_left_layout;}
+ set {
+ if (right_to_left_layout != value) {
+ right_to_left_layout = value;
+ OnRightToLeftLayoutChanged (EventArgs.Empty);
+ }
+ }
}
[DefaultValue (10)]
}
}
-#if NET_2_0
- [MonoTODO("Implement")]
+ [Browsable (true)]
+ [DefaultValue (ProgressBarStyle.Blocks)]
+ [EditorBrowsable (EditorBrowsableState.Always)]
public ProgressBarStyle Style {
get {
return style;
}
set {
- style = value;
+ if (value != ProgressBarStyle.Blocks && value != ProgressBarStyle.Continuous
+ && value != ProgressBarStyle.Marquee)
+ throw new InvalidEnumArgumentException ("value", unchecked((int)value), typeof (ProgressBarStyle));
+ if (style != value) {
+ style = value;
+
+ if (style == ProgressBarStyle.Marquee) {
+ if (marquee_timer == null) {
+ marquee_timer = new Timer ();
+ marquee_timer.Interval = 10;
+ marquee_timer.Tick += new EventHandler (marquee_timer_Tick);
+ }
+ marquee_timer.Start ();
+ } else {
+ if (marquee_timer != null) {
+ marquee_timer.Stop ();
+ }
+ Refresh ();
+ }
+ }
+ }
+ }
+
+ void marquee_timer_Tick (object sender, EventArgs e)
+ {
+ Invalidate ();
+ }
+
+ int marquee_animation_speed = 100;
+ [DefaultValue (100)]
+ public int MarqueeAnimationSpeed {
+ get {
+ return marquee_animation_speed;
+ }
+
+ set {
+ marquee_animation_speed = value;
}
}
-#endif
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
}
set {
if (value < Minimum || value > Maximum)
- throw new ArgumentException(
- string.Format("'{0}' is not a valid value for 'Value'. 'Value' should be between 'Minimum' and 'Maximum'", value));
-
+ throw new ArgumentOutOfRangeException ("Value", string.Format("'{0}' is not a valid value for 'Value'. 'Value' should be between 'Minimum' and 'Maximum'", value));
val = value;
Refresh ();
}
public void Increment (int value)
{
+ if (Style == ProgressBarStyle.Marquee)
+ throw new InvalidOperationException ("Increment should not be called if the style is Marquee.");
+
int newValue = Value + value;
if (newValue < Minimum)
UpdateAreas ();
}
+ protected override void OnBackColorChanged (EventArgs e)
+ {
+ base.OnBackColorChanged (e);
+ }
+
+ protected override void OnForeColorChanged (EventArgs e)
+ {
+ base.OnForeColorChanged (e);
+ }
+
+ protected override void OnHandleDestroyed (EventArgs e)
+ {
+ base.OnHandleDestroyed (e);
+ }
+
+ [EditorBrowsable(EditorBrowsableState.Advanced)]
+ protected virtual void OnRightToLeftLayoutChanged(EventArgs e)
+ {
+ EventHandler eh = (EventHandler) Events [RightToLeftLayoutChangedEvent];
+ if (eh != null)
+ eh (this, e);
+ }
+
public void PerformStep ()
{
- if (Value >= Maximum)
- return;
+ if (Style == ProgressBarStyle.Marquee)
+ throw new InvalidOperationException ("PerformStep should not be called if the style is Marquee.");
- Value = Maximum < Value + Step ? Maximum : Value + Step;
- Refresh (); // FIXME - calculate delta and only expose that
+ Increment (Step);
+ }
+
+ [EditorBrowsable (EditorBrowsableState.Never)]
+ public override void ResetForeColor ()
+ {
+ ForeColor = defaultForeColor;
}
public override string ToString()
{
return string.Format ("{0}, Minimum: {1}, Maximum: {2}, Value: {3}",
- GetType().FullName.ToString (),
+ GetType().FullName,
Minimum.ToString (),
Maximum.ToString (),
Value.ToString () );
#endregion // Public Instance Methods
#region Private Instance Methods
+
private void UpdateAreas ()
{
client_area.X = client_area.Y = 2;
}
private void OnResizeTB (Object o, EventArgs e)
- {
- if (Width <= 0 || Height <= 0)
- return;
+ {
+ if (Width <= 0 || Height <= 0)
+ return;
UpdateAreas ();
Invalidate(); // Invalidate the full surface, blocks will not match
- }
+ }
internal override void OnPaintInternal (PaintEventArgs pevent)
{
- ThemeEngine.Current.DrawProgressBar (pevent.Graphics, pevent.ClipRectangle, this);
- }
-
+ ThemeEngine.Current.DrawProgressBar (pevent.Graphics, pevent.ClipRectangle, this);
+ }
+
#endregion
}
}
projects / mono.git / blobdiff