* Label.cs, LinkLabel.cs: Source code identation fixes.
2007-01-08 Everaldo Canuto <everaldo@simios.org>
svn path=/trunk/mcs/; revision=70724
-007-01-08 Everaldo Canuto <everaldo@simios.org>
+2007-01-09 Everaldo Canuto <everaldo@simios.org>
+
+ * Label.cs, LinkLabel.cs: Source code identation fixes.
+
+2007-01-08 Everaldo Canuto <everaldo@simios.org>
* ToolBarButton.cs: Remove InvalidateBorder and use Invalidate instead,
we dont need to invalidate only borders because when we invalidate four
* ToolBarButton.cs: Remove InvalidateBorder and use Invalidate instead,
we dont need to invalidate only borders because when we invalidate four
[DefaultBindingProperty ("Text")]
#endif
public class Label : Control
[DefaultBindingProperty ("Text")]
#endif
public class Label : Control
- {
- private bool autosize;
- private Image image;
- private bool render_transparent;
- private FlatStyle flat_style;
- private int preferred_height;
- private int preferred_width;
- private bool use_mnemonic;
- private int image_index = -1;
- private ImageList image_list;
+ {
+ private bool autosize;
+ private Image image;
+ private bool render_transparent;
+ private FlatStyle flat_style;
+ private int preferred_height;
+ private int preferred_width;
+ private bool use_mnemonic;
+ private int image_index = -1;
+ private ImageList image_list;
internal ContentAlignment image_align;
internal StringFormat string_format;
internal ContentAlignment image_align;
internal StringFormat string_format;
- internal ContentAlignment text_align;
- static SizeF req_witdthsize = new SizeF (0,0);
+ internal ContentAlignment text_align;
+ static SizeF req_witdthsize = new SizeF (0,0);
static object AutoSizeChangedEvent = new object ();
static object TextAlignChangedEvent = new object ();
static object AutoSizeChangedEvent = new object ();
static object TextAlignChangedEvent = new object ();
[Browsable (true)]
[EditorBrowsable (EditorBrowsableState.Always)]
#endif
[Browsable (true)]
[EditorBrowsable (EditorBrowsableState.Always)]
#endif
- public new event EventHandler AutoSizeChanged {
+ public new event EventHandler AutoSizeChanged {
add { Events.AddHandler (AutoSizeChangedEvent, value); }
remove { Events.RemoveHandler (AutoSizeChangedEvent, value); }
}
add { Events.AddHandler (AutoSizeChangedEvent, value); }
remove { Events.RemoveHandler (AutoSizeChangedEvent, value); }
}
remove { base.KeyDown -= value; }
}
remove { base.KeyDown -= value; }
}
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
public new event KeyPressEventHandler KeyPress {
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
public new event KeyPressEventHandler KeyPress {
remove { base.KeyPress -= value; }
}
remove { base.KeyPress -= value; }
}
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
public new event KeyEventHandler KeyUp {
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
public new event KeyEventHandler KeyUp {
remove { base.KeyUp -= value; }
}
remove { base.KeyUp -= value; }
}
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
public new event EventHandler TabStopChanged {
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
public new event EventHandler TabStopChanged {
{
// Defaults in the Spec
autosize = false;
{
// Defaults in the Spec
autosize = false;
[DesignerSerializationVisibility (DesignerSerializationVisibility.Visible)]
[EditorBrowsable (EditorBrowsableState.Always)]
#endif
[DesignerSerializationVisibility (DesignerSerializationVisibility.Visible)]
[EditorBrowsable (EditorBrowsableState.Always)]
#endif
- public new virtual bool AutoSize {
- get { return autosize; }
- set {
- if (autosize == value)
- return;
-
- autosize = value;
- CalcAutoSize ();
+ public new virtual bool AutoSize {
+ get { return autosize; }
+ set {
+ if (autosize == value)
+ return;
+
+ autosize = value;
+ CalcAutoSize ();
Refresh ();
OnAutoSizeChanged (EventArgs.Empty);
Refresh ();
OnAutoSizeChanged (EventArgs.Empty);
[Browsable(false)]
[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
[EditorBrowsable(EditorBrowsableState.Never)]
public override Image BackgroundImage {
[Browsable(false)]
[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
[EditorBrowsable(EditorBrowsableState.Never)]
public override Image BackgroundImage {
- get {
- return base.BackgroundImage;
- }
- set {
+ get { return base.BackgroundImage; }
+ set {
base.BackgroundImage = value;
Refresh ();
base.BackgroundImage = value;
Refresh ();
[DefaultValue(BorderStyle.None)]
[DispId(-504)]
[DefaultValue(BorderStyle.None)]
[DispId(-504)]
- public virtual BorderStyle BorderStyle {
- get { return InternalBorderStyle; }
- set { InternalBorderStyle = value; }
- }
-
- protected override CreateParams CreateParams {
- get {
- CreateParams create_params = base.CreateParams;
+ public virtual BorderStyle BorderStyle {
+ get { return InternalBorderStyle; }
+ set { InternalBorderStyle = value; }
+ }
+
+ protected override CreateParams CreateParams {
+ get {
+ CreateParams create_params = base.CreateParams;
- if (BorderStyle != BorderStyle.Fixed3D)
- return create_params;
+ if (BorderStyle != BorderStyle.Fixed3D)
+ return create_params;
- create_params.ExStyle &= ~(int) WindowExStyles.WS_EX_CLIENTEDGE;
- create_params.ExStyle |= (int)WindowExStyles.WS_EX_STATICEDGE;
+ create_params.ExStyle &= ~(int) WindowExStyles.WS_EX_CLIENTEDGE;
+ create_params.ExStyle |= (int)WindowExStyles.WS_EX_STATICEDGE;
- return create_params;
- }
- protected override ImeMode DefaultImeMode {
- get { return ImeMode.Disable;}
- }
+ protected override ImeMode DefaultImeMode {
+ get { return ImeMode.Disable;}
+ }
- protected override Size DefaultSize {
- get {return ThemeEngine.Current.LabelDefaultSize;}
- }
+ protected override Size DefaultSize {
+ get {return ThemeEngine.Current.LabelDefaultSize;}
+ }
[DefaultValue(FlatStyle.Standard)]
public FlatStyle FlatStyle {
[DefaultValue(FlatStyle.Standard)]
public FlatStyle FlatStyle {
- get {
- return flat_style;
- }
- set {
+ get { return flat_style; }
+ set {
if (!Enum.IsDefined (typeof (FlatStyle), value))
throw new InvalidEnumArgumentException (string.Format("Enum argument value '{0}' is not valid for FlatStyle", value));
if (!Enum.IsDefined (typeof (FlatStyle), value))
throw new InvalidEnumArgumentException (string.Format("Enum argument value '{0}' is not valid for FlatStyle", value));
- if (flat_style == value)
+ if (flat_style == value)
- public Image Image {
- get {
- if (image != null) {
- return image;
- }
+ public Image Image {
+ get {
+ if (image != null) {
+ return image;
+ }
- if (image_list != null && ImageIndex >= 0) {
- return image_list.Images[ImageIndex];
- }
+ if (image_list != null && ImageIndex >= 0) {
+ return image_list.Images[ImageIndex];
+ }
- return null;
- }
- set {
- if (image == value)
+ return null;
+ }
+ set {
+ if (image == value)
[DefaultValue(ContentAlignment.MiddleCenter)]
[Localizable(true)]
[DefaultValue(ContentAlignment.MiddleCenter)]
[Localizable(true)]
- public ContentAlignment ImageAlign {
- get {
- return image_align;
- }
- set {
+ public ContentAlignment ImageAlign {
+ get { return image_align; }
+ set {
if (!Enum.IsDefined (typeof (ContentAlignment), value))
throw new InvalidEnumArgumentException (string.Format("Enum argument value '{0}' is not valid for ContentAlignment", value));
if (!Enum.IsDefined (typeof (ContentAlignment), value))
throw new InvalidEnumArgumentException (string.Format("Enum argument value '{0}' is not valid for ContentAlignment", value));
- if (image_align == value)
- return;
+ if (image_align == value)
+ return;
- image_align = value;
- Refresh ();
- }
- }
+ image_align = value;
+ Refresh ();
+ }
+ }
[DefaultValue (-1)]
[Editor ("System.Windows.Forms.Design.ImageIndexEditor, " + Consts.AssemblySystem_Design, typeof (System.Drawing.Design.UITypeEditor))]
[DefaultValue (-1)]
[Editor ("System.Windows.Forms.Design.ImageIndexEditor, " + Consts.AssemblySystem_Design, typeof (System.Drawing.Design.UITypeEditor))]
[RefreshProperties (RefreshProperties.Repaint)]
#endif
public int ImageIndex {
[RefreshProperties (RefreshProperties.Repaint)]
#endif
public int ImageIndex {
- get {
- if (ImageList == null) {
- return -1;
- }
+ get {
+ if (ImageList == null) {
+ return -1;
+ }
- if (image_index >= image_list.Images.Count) {
- return image_list.Images.Count - 1;
- }
+ if (image_index >= image_list.Images.Count) {
+ return image_list.Images.Count - 1;
+ }
- return image_index;
- }
- set {
+ return image_index;
+ }
+ set {
if (value < -1)
throw new ArgumentException ();
if (value < -1)
throw new ArgumentException ();
- if (image_index == value)
+ if (image_index == value)
return;
image_index = value;
return;
image_index = value;
if (ImageList != null && image_index !=-1)
Image = null;
if (ImageList != null && image_index !=-1)
Image = null;
[DefaultValue(null)]
#if NET_2_0
[RefreshProperties (RefreshProperties.Repaint)]
#endif
[DefaultValue(null)]
#if NET_2_0
[RefreshProperties (RefreshProperties.Repaint)]
#endif
- public ImageList ImageList {
- get { return image_list;}
- set {
- if (image_list == value)
+ public ImageList ImageList {
+ get { return image_list;}
+ set {
+ if (image_list == value)
return;
image_list = value;
return;
image_list = value;
if (image_list != null && image_index !=-1)
Image = null;
if (image_list != null && image_index !=-1)
Image = null;
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
- public new ImeMode ImeMode {
+ public new ImeMode ImeMode {
get { return base.ImeMode; }
set { base.ImeMode = value; }
}
get { return base.ImeMode; }
set { base.ImeMode = value; }
}
[DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden)]
[EditorBrowsable(EditorBrowsableState.Advanced)]
public virtual int PreferredHeight {
[DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden)]
[EditorBrowsable(EditorBrowsableState.Advanced)]
public virtual int PreferredHeight {
- get { return preferred_height; }
- }
+ get { return preferred_height; }
+ }
[Browsable(false)]
[DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden)]
[EditorBrowsable(EditorBrowsableState.Advanced)]
public virtual int PreferredWidth {
[Browsable(false)]
[DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden)]
[EditorBrowsable(EditorBrowsableState.Advanced)]
public virtual int PreferredWidth {
- get {return preferred_width; }
- }
+ get {return preferred_width; }
+ }
#if NET_2_0
[Obsolete ("This property has been deprecated. Use BackColor instead.")]
#endif
#if NET_2_0
[Obsolete ("This property has been deprecated. Use BackColor instead.")]
#endif
- protected virtual bool RenderTransparent {
+ protected virtual bool RenderTransparent {
get { return render_transparent; }
set { render_transparent = value;}
}
get { return render_transparent; }
set { render_transparent = value;}
}
[DefaultValue(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
public new bool TabStop {
[DefaultValue(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
public new bool TabStop {
- get { return base.TabStop; }
- set { base.TabStop = value; }
- }
+ get { return base.TabStop; }
+ set { base.TabStop = value; }
+ }
[DefaultValue(ContentAlignment.TopLeft)]
[Localizable(true)]
public virtual ContentAlignment TextAlign {
[DefaultValue(ContentAlignment.TopLeft)]
[Localizable(true)]
public virtual ContentAlignment TextAlign {
- get { return text_align; }
+ get { return text_align; }
if (!Enum.IsDefined (typeof (ContentAlignment), value))
throw new InvalidEnumArgumentException (string.Format("Enum argument value '{0}' is not valid for ContentAlignment", value));
if (!Enum.IsDefined (typeof (ContentAlignment), value))
throw new InvalidEnumArgumentException (string.Format("Enum argument value '{0}' is not valid for ContentAlignment", value));
[DefaultValue(true)]
public bool UseMnemonic {
[DefaultValue(true)]
public bool UseMnemonic {
- get { return use_mnemonic; }
+ get { return use_mnemonic; }
- if (use_mnemonic != value) {
+ if (use_mnemonic != value) {
use_mnemonic = value;
SetUseMnemonic (use_mnemonic);
use_mnemonic = value;
SetUseMnemonic (use_mnemonic);
- Refresh ();
- }
- }
- }
-
- #endregion
+ Refresh ();
+ }
+ }
+ }
- protected Rectangle CalcImageRenderBounds (Image image, Rectangle area, ContentAlignment img_align)
- {
+ protected Rectangle CalcImageRenderBounds (Image image, Rectangle area, ContentAlignment img_align)
+ {
Rectangle rcImageClip = area;
rcImageClip.Inflate (-2,-2);
Rectangle rcImageClip = area;
rcImageClip.Inflate (-2,-2);
rcImageClip.Height = image.Height;
return rcImageClip;
rcImageClip.Height = image.Height;
return rcImageClip;
protected override AccessibleObject CreateAccessibilityInstance ()
{
return base.CreateAccessibilityInstance ();
}
protected override AccessibleObject CreateAccessibilityInstance ()
{
return base.CreateAccessibilityInstance ();
}
- protected override void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
{
base.Dispose (disposing);
{
base.Dispose (disposing);
string_format.Dispose ();
}
string_format.Dispose ();
}
- protected void DrawImage (Graphics g, Image image, Rectangle area, ContentAlignment img_align)
- {
+ protected void DrawImage (Graphics g, Image image, Rectangle area, ContentAlignment img_align)
+ {
if (image == null || g == null)
return;
if (image == null || g == null)
return;
ControlPaint.DrawImageDisabled (g, image, rcImageClip.X, rcImageClip.Y, BackColor);
}
ControlPaint.DrawImageDisabled (g, image, rcImageClip.X, rcImageClip.Y, BackColor);
}
- protected virtual void OnAutoSizeChanged (EventArgs e)
+ protected virtual void OnAutoSizeChanged (EventArgs e)
{
EventHandler eh = (EventHandler)(Events [AutoSizeChangedEvent]);
if (eh != null)
eh (this, e);
{
EventHandler eh = (EventHandler)(Events [AutoSizeChangedEvent]);
if (eh != null)
eh (this, e);
- protected override void OnEnabledChanged (EventArgs e)
- {
+ protected override void OnEnabledChanged (EventArgs e)
+ {
base.OnEnabledChanged (e);
base.OnEnabledChanged (e);
- protected override void OnFontChanged (EventArgs e)
- {
+ protected override void OnFontChanged (EventArgs e)
+ {
base.OnFontChanged (e);
if (autosize) {
CalcAutoSize();
base.OnFontChanged (e);
if (autosize) {
CalcAutoSize();
CalcPreferredHeight ();
}
Refresh ();
CalcPreferredHeight ();
}
Refresh ();
- protected override void OnPaint (PaintEventArgs pevent)
+ protected override void OnPaint (PaintEventArgs pevent)
{
ThemeEngine.Current.DrawLabel (pevent.Graphics, ClientRectangle, this);
DrawImage (pevent.Graphics, Image, ClientRectangle, image_align);
base.OnPaint(pevent);
}
{
ThemeEngine.Current.DrawLabel (pevent.Graphics, ClientRectangle, this);
DrawImage (pevent.Graphics, Image, ClientRectangle, image_align);
base.OnPaint(pevent);
}
- protected override void OnParentChanged (EventArgs e)
- {
+ protected override void OnParentChanged (EventArgs e)
+ {
base.OnParentChanged (e);
base.OnParentChanged (e);
- protected virtual void OnTextAlignChanged (EventArgs e)
- {
+ protected virtual void OnTextAlignChanged (EventArgs e)
+ {
EventHandler eh = (EventHandler)(Events [TextAlignChangedEvent]);
if (eh != null)
eh (this, e);
EventHandler eh = (EventHandler)(Events [TextAlignChangedEvent]);
if (eh != null)
eh (this, e);
- protected override void OnTextChanged (EventArgs e)
- {
+ protected override void OnTextChanged (EventArgs e)
+ {
base.OnTextChanged (e);
if (autosize) {
CalcAutoSize ();
base.OnTextChanged (e);
if (autosize) {
CalcAutoSize ();
CalcPreferredWidth ();
}
Refresh ();
CalcPreferredWidth ();
}
Refresh ();
- protected override void OnVisibleChanged (EventArgs e)
- {
- base.OnVisibleChanged (e);
- }
+ protected override void OnVisibleChanged (EventArgs e)
+ {
+ base.OnVisibleChanged (e);
+ }
- protected override bool ProcessMnemonic (char charCode)
- {
+ protected override bool ProcessMnemonic (char charCode)
+ {
if (IsMnemonic(charCode, Text) == true) {
// Select item next in line in tab order
if (this.Parent != null) {
if (IsMnemonic(charCode, Text) == true) {
// Select item next in line in tab order
if (this.Parent != null) {
}
return base.ProcessMnemonic (charCode);
}
return base.ProcessMnemonic (charCode);
- protected override void SetBoundsCore (int x, int y, int width, int height, BoundsSpecified specified)
- {
- base.SetBoundsCore (x, y, width, height, specified);
- }
+ protected override void SetBoundsCore (int x, int y, int width, int height, BoundsSpecified specified)
+ {
+ base.SetBoundsCore (x, y, width, height, specified);
+ }
- public override string ToString()
- {
- return base.ToString () + ", Text: " + Text;
- }
+ public override string ToString()
+ {
+ return base.ToString () + ", Text: " + Text;
+ }
- protected override void WndProc (ref Message m)
- {
+ protected override void WndProc (ref Message m)
+ {
switch ((Msg) m.Msg) {
case Msg.WM_DRAWITEM: {
m.Result = (IntPtr)1;
switch ((Msg) m.Msg) {
case Msg.WM_DRAWITEM: {
m.Result = (IntPtr)1;
base.WndProc (ref m);
break;
}
base.WndProc (ref m);
break;
}
- #endregion Public Methods
+ #endregion Public Methods
- #region Private Methods
+ #region Private Methods
private void CalcAutoSize ()
private void CalcAutoSize ()
- {
- if (IsHandleCreated == false || AutoSize == false)
- return;
+ {
+ if (IsHandleCreated == false || AutoSize == false)
+ return;
- CalcPreferredWidth ();
- CalcPreferredHeight ();
+ CalcPreferredWidth ();
+ CalcPreferredHeight ();
- Width = PreferredWidth;
- Height = PreferredHeight;
- }
+ Width = PreferredWidth;
+ Height = PreferredHeight;
+ }
- private void CalcPreferredHeight ()
+ private void CalcPreferredHeight ()
{
preferred_height = Font.Height;
{
preferred_height = Font.Height;
- private void CalcPreferredWidth ()
+ private void CalcPreferredWidth ()
{
if (Text == string.Empty) {
preferred_width = 0;
{
if (Text == string.Empty) {
preferred_width = 0;
- private void OnHandleCreatedLB (Object o, EventArgs e)
+ private void OnHandleCreatedLB (Object o, EventArgs e)
{
if (autosize)
CalcAutoSize ();
}
private void SetUseMnemonic (bool use)
{
if (autosize)
CalcAutoSize ();
}
private void SetUseMnemonic (bool use)
if (use)
string_format.HotkeyPrefix = HotkeyPrefix.Show;
else
string_format.HotkeyPrefix = HotkeyPrefix.None;
if (use)
string_format.HotkeyPrefix = HotkeyPrefix.Show;
else
string_format.HotkeyPrefix = HotkeyPrefix.None;
#endregion Private Methods
#if NET_2_0
[DefaultValue (false)]
public bool UseCompatibleTextRendering {
#endregion Private Methods
#if NET_2_0
[DefaultValue (false)]
public bool UseCompatibleTextRendering {
- get {
- return use_compatible_text_rendering;
- }
-
- set {
- use_compatible_text_rendering = value;
- }
+ get { return use_compatible_text_rendering; }
+ set { use_compatible_text_rendering = value; }
}
[SettingsBindable (true)]
[Editor ("System.ComponentModel.Design.MultilineStringEditor, " + Consts.AssemblySystem_Design,
typeof (System.Drawing.Design.UITypeEditor))]
public override string Text {
}
[SettingsBindable (true)]
[Editor ("System.ComponentModel.Design.MultilineStringEditor, " + Consts.AssemblySystem_Design,
typeof (System.Drawing.Design.UITypeEditor))]
public override string Text {
- get {
- return base.Text;
- }
-
- set {
- base.Text = value;
- }
+ get { return base.Text; }
+ set { base.Text = value; }
}
protected override void OnMouseEnter (EventArgs e)
}
protected override void OnMouseEnter (EventArgs e)
}
protected override void WndProc (ref Message m)
}
protected override void WndProc (ref Message m)
#endregion //Public Methods
#endregion //Public Methods
projects / mono.git / commitdiff