|
| From: | Rhys Weatherley <address@hidden> |
| Subject: | [Dotgnu-pnet-commits] CVS: pnetlib/System.Windows.Forms ButtonBase.cs,1.3,1.4 Control.cs,1.6,1.7 EventId.cs,1.1,1.2 Label.cs,1.1,1.2 |
| Date: | Thu, 12 Jun 2003 21:30:25 -0400 |
Update of /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms
In directory subversions:/tmp/cvs-serv31384/System.Windows.Forms
Modified Files:
ButtonBase.cs Control.cs EventId.cs Label.cs
Log Message:
Implement the "Label" widget.
Index: ButtonBase.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/ButtonBase.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ButtonBase.cs 12 Jun 2003 07:56:35 -0000 1.3
--- ButtonBase.cs 13 Jun 2003 01:30:23 -0000 1.4
***************
*** 213,218 ****
private void SetStringFormat()
{
! ContentAlignment align =
RtlTranslateAlignment(textAlign);
! switch(textAlign)
{
case ContentAlignment.TopLeft:
--- 213,217 ----
private void SetStringFormat()
{
! switch(RtlTranslateAlignment(TextAlign))
{
case ContentAlignment.TopLeft:
Index: Control.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/Control.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Control.cs 12 Jun 2003 07:56:35 -0000 1.6
--- Control.cs 13 Jun 2003 01:30:23 -0000 1.7
***************
*** 1389,1392 ****
--- 1389,1393 ----
public Graphics CreateGraphics()
{
+ CreateControl();
if(toolkitWindow != null)
{
Index: EventId.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/EventId.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** EventId.cs 11 Jun 2003 07:07:19 -0000 1.1
--- EventId.cs 13 Jun 2003 01:30:23 -0000 1.2
***************
*** 91,94 ****
--- 91,98 ----
CheckStateChanged,
+ // "Label" events.
+ AutoSizeChanged,
+ TextAlignChanged,
+
}; // enum EventId
Index: Label.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/Label.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Label.cs 11 Jun 2003 07:07:19 -0000 1.1
--- Label.cs 13 Jun 2003 01:30:23 -0000 1.2
***************
*** 24,41 ****
using System.Drawing;
! using System.Windows.Forms.Toolkit;
public class Label : Control
{
// Internal state.
private ContentAlignment alignment;
// Contructor.
public Label()
{
this.alignment = ContentAlignment.MiddleLeft;
}
! // Get or set the label's text alignment.
public ContentAlignment TextAlign
{
--- 24,245 ----
using System.Drawing;
! using System.Drawing.Text;
public class Label : Control
{
// Internal state.
+ private bool autoSize;
+ private bool useMnemonic;
+ private bool renderTransparent;
+ private BorderStyle borderStyle;
+ private FlatStyle flatStyle;
private ContentAlignment alignment;
+ private Image image;
+ private ContentAlignment imageAlign;
+ private int imageIndex;
+ private ImageList imageList;
+ private int preferredWidth;
// Contructor.
public Label()
{
+ SetStyle(ControlStyles.ResizeRedraw, true);
+ this.useMnemonic = true;
+ this.flatStyle = FlatStyle.Standard;
this.alignment = ContentAlignment.MiddleLeft;
+ this.preferredWidth = -1;
}
! // Get or set this label's properties.
! public virtual bool AutoSize
! {
! get
! {
! return autoSize;
! }
! set
! {
! if(autoSize != value)
! {
! autoSize = value;
!
OnAutoSizeChanged(EventArgs.Empty);
! }
! }
! }
! public virtual BorderStyle BorderStyle
! {
! get
! {
! return borderStyle;
! }
! set
! {
! if(borderStyle != value)
! {
! borderStyle = value;
! Invalidate();
! }
! }
! }
! protected override CreateParams CreateParams
! {
! get
! {
! return base.CreateParams;
! }
! }
! protected override ImeMode DefaultImeMode
! {
! get
! {
! return ImeMode.Disable;
! }
! }
! protected override Size DefaultSize
! {
! get
! {
! if(AutoSize)
! {
! // The preferred width will be
based on the text,
! // but when "DefaultSize" is
called from the "Label"
! // constructor, the text isn't
set yet. So we
! // default to 100 for the width
and use the font
! // for the preferred height.
! return new Size(100,
PreferredHeight);
! }
! else
! {
! return new Size(100, 23);
! }
! }
! }
! public Image Image
! {
! get
! {
! return image;
! }
! set
! {
! if(image != value)
! {
! image = value;
! Recalculate();
! }
! }
! }
! public ContentAlignment ImageAlign
! {
! get
! {
! return imageAlign;
! }
! set
! {
! if(imageAlign != value)
! {
! imageAlign = value;
! Recalculate();
! }
! }
! }
! public int ImageIndex
! {
! get
! {
! return imageIndex;
! }
! set
! {
! if(imageIndex != value)
! {
! imageIndex = value;
! Recalculate();
! }
! }
! }
! public ImageList ImageList
! {
! get
! {
! return imageList;
! }
! set
! {
! if(imageList != value)
! {
! imageList = value;
! Recalculate();
! }
! }
! }
! public virtual int PreferredHeight
! {
! get
! {
! int height = FontHeight;
! if(BorderStyle == BorderStyle.None)
! {
! return height + 3;
! }
! else
! {
! return height + 6;
! }
! }
! }
! public virtual int PreferredWidth
! {
! get
! {
! // See if we have a cached width from
last time.
! if(preferredWidth != -1)
! {
! return preferredWidth;
! }
!
! // Bail out if the text string is empty.
! String text = Text;
! if(text == null || text == String.Empty)
! {
! preferredWidth = 0;
! return 0;
! }
!
! // Get a graphics object and measure
the text.
! Graphics graphics = CreateGraphics();
! SizeF size = graphics.MeasureString
! (text, Font, new SizeF(0.0f,
0.0f), GetStringFormat());
! graphics.Dispose();
!
! // Return the ceiling of the width.
! #if CONFIG_EXTENDED_NUMERICS
! preferredWidth =
(int)(Math.Ceiling(size.Width));
! #else
! preferredWidth = (int)(size.Width +
0.99f);
! #endif
! if(BorderStyle != BorderStyle.None)
! {
! preferredWidth += 2;
! }
! return preferredWidth;
! }
! }
! protected virtual bool RenderTransparent
! {
! get
! {
! return renderTransparent;
! }
! set
! {
! if(renderTransparent != value)
! {
! renderTransparent = value;
! Invalidate();
! }
! }
! }
public ContentAlignment TextAlign
{
***************
*** 49,54 ****
--- 253,654 ----
{
alignment = value;
+
OnTextAlignChanged(EventArgs.Empty);
+ }
+ }
+ }
+ public bool UseMnemonic
+ {
+ get
+ {
+ return useMnemonic;
+ }
+ set
+ {
+ if(useMnemonic != value)
+ {
+ useMnemonic = value;
+ Invalidate();
+ }
+ }
+ }
+
+ // Event that is emitted when the "AutoSize" property changes.
+ public event EventHandler AutoSizeChanged
+ {
+ add
+ {
+ AddHandler(EventId.AutoSizeChanged,
value);
+ }
+ remove
+ {
+ RemoveHandler(EventId.AutoSizeChanged,
value);
+ }
+ }
+
+ // Event that is emitted when the "TextAlign" property changes.
+ public event EventHandler TextAlignChanged
+ {
+ add
+ {
+ AddHandler(EventId.TextAlignChanged,
value);
+ }
+ remove
+ {
+ RemoveHandler(EventId.TextAlignChanged,
value);
+ }
+ }
+
+ // Calculate the image rendering bounds.
+ protected Rectangle CalcImageRenderBounds
+ (Image image, Rectangle r, ContentAlignment
align)
+ {
+ int width = image.Width;
+ int height = image.Height;
+ Rectangle result = new Rectangle();
+ switch(align)
+ {
+ case ContentAlignment.TopLeft:
+ default:
+ {
+ result.X = r.X;
+ result.Y = r.Y;
+ }
+ break;
+
+ case ContentAlignment.TopCenter:
+ {
+ result.X = r.X + (r.Width -
width) / 2;
+ result.Y = r.Y;
+ }
+ break;
+
+ case ContentAlignment.TopRight:
+ {
+ result.X = r.X + r.Width -
width;
+ result.Y = r.Y;
+ }
+ break;
+
+ case ContentAlignment.MiddleLeft:
+ {
+ result.X = r.X;
+ result.Y = r.Y + (r.Height -
height) / 2;
+ }
+ break;
+
+ case ContentAlignment.MiddleCenter:
+ {
+ result.X = r.X + (r.Width -
width) / 2;
+ result.Y = r.Y + (r.Height -
height) / 2;
+ }
+ break;
+
+ case ContentAlignment.MiddleRight:
+ {
+ result.X = r.X + r.Width -
width;
+ result.Y = r.Y + (r.Height -
height) / 2;
+ }
+ break;
+
+ case ContentAlignment.BottomLeft:
+ {
+ result.X = r.X;
+ result.Y = r.Y + r.Height -
height;
+ }
+ break;
+
+ case ContentAlignment.BottomCenter:
+ {
+ result.X = r.X + (r.Width -
width) / 2;
+ result.Y = r.Y + r.Height -
height;
+ }
+ break;
+
+ case ContentAlignment.BottomRight:
+ {
+ result.X = r.X + r.Width -
width;
+ result.Y = r.Y + r.Height -
height;
+ }
+ break;
+ }
+ result.Width = width;
+ result.Height = height;
+ return result;
+ }
+
+ #if !CONFIG_COMPACT_FORMS
+
+ // Create the accessibility object for this control.
+ protected override AccessibleObject CreateAccessibilityInstance()
+ {
+ return base.CreateAccessibilityInstance();
+ }
+
+ #endif
+
+ // Dispose of this instance.
+ protected override void Dispose(bool disposing)
+ {
+ // Nothing to do in this implementation.
+ base.Dispose(disposing);
+ }
+
+ // Draw an image within the specified bounds.
+ protected void DrawImage
+ (Graphics g, Image image, Rectangle r,
ContentAlignment align)
+ {
+ Rectangle bounds = CalcImageRenderBounds(image,
r, align);
+ g.DrawImage(image, bounds);
+ }
+
+ // Raise the "AutoSizeChanged" event.
+ protected virtual void OnAutoSizeChanged(EventArgs e)
+ {
+ // Invalidate this control to repaint it.
+ Invalidate();
+
+ // Invoke the event handler.
+ EventHandler handler;
+ handler = (EventHandler)
+ (GetHandler(EventId.AutoSizeChanged));
+ if(handler != null)
+ {
+ handler(this, e);
+ }
+ }
+
+ // Override the "FontChanged" event.
+ protected override void OnFontChanged(EventArgs e)
+ {
+ base.OnFontChanged(e);
+ Recalculate();
+ }
+
+ // Override the "Paint" event.
+ [TODO]
+ protected override void OnPaint(PaintEventArgs e)
+ {
+ Graphics graphics = e.Graphics;
+ Rectangle rect = ClientRectangle;
+
+ // Draw the border on the label.
+ switch(BorderStyle)
+ {
+ case BorderStyle.FixedSingle:
+ {
+ ControlPaint.DrawBorder
+ (graphics, rect,
ForeColor,
+
ButtonBorderStyle.Solid);
+ }
+ break;
+
+ case BorderStyle.Fixed3D:
+ {
+ ControlPaint.DrawBorder
+ (graphics, rect,
BackColor,
+
ButtonBorderStyle.Inset);
+ }
+ break;
+ }
+
+ // Draw the text within the label.
+ String text = Text;
+ Font font = Font;
+ RectangleF layout = (RectangleF)rect;
+ StringFormat format = GetStringFormat();
+ if(text != null && text != String.Empty)
+ {
+ if(Enabled)
+ {
+ Brush brush = new
SolidBrush(ForeColor);
+ graphics.DrawString(text, font,
brush, layout, format);
+ brush.Dispose();
+ }
+ else
+ {
+ ControlPaint.DrawStringDisabled
+ (graphics, text, font,
BackColor, layout, format);
+ }
+ }
+
+ // TODO: image labels
+ base.OnPaint(e);
+ }
+
+ // Override the "ParentChanged" event.
+ protected override void OnParentChanged(EventArgs e)
+ {
+ base.OnParentChanged(e);
+ }
+
+ // Raise the "TextAlignChanged" event.
+ protected virtual void OnTextAlignChanged(EventArgs e)
+ {
+ // Invalidate this control to repaint it.
+ Invalidate();
+
+ // Invoke the event handler.
+ EventHandler handler;
+ handler = (EventHandler)
+ (GetHandler(EventId.TextAlignChanged));
+ if(handler != null)
+ {
+ handler(this, e);
+ }
+ }
+
+ // Override the "TextChanged" event.
+ protected override void OnTextChanged(EventArgs e)
+ {
+ base.OnTextChanged(e);
+ Recalculate();
+ }
+
+ // Override the "VisibleChanged" event.
+ protected override void OnVisibleChanged(EventArgs e)
+ {
+ base.OnVisibleChanged(e);
+ }
+
+ // Process a key mnemonic. For labels, we pass the selection
+ // focus onto the control that follows the label.
+ protected override bool ProcessMnemonic(char charCode)
+ {
+ if(useMnemonic && IsMnemonic(charCode, Text))
+ {
+ Control parent = Parent;
+ if(parent != null)
+ {
+ parent.SelectNextControl
+ (this, true, false,
true, false);
+ if(parent.ContainsFocus)
+ {
+ parent.Focus();
+ }
+ return true;
+ }
+ }
+ return base.ProcessMnemonic(charCode);
+ }
+
+ // Inner core of "SetBounds".
+ protected override void SetBoundsCore
+ (int x, int y, int width, int height,
+ BoundsSpecified specified)
+ {
+ if(AutoSize)
+ {
+ width = PreferredWidth;
+ height = PreferredHeight;
+ }
+ base.SetBoundsCore(x, y, width, height,
specified);
+ }
+
+ // Convert this object into a string.
+ public override String ToString()
+ {
+ return base.ToString() + ", Text: " + Text;
+ }
+
+ #if !CONFIG_COMPACT_FORMS
+
+ // Process a message.
+ public override void WndProc(ref Message m)
+ {
+ base.WndProc(ref m);
+ }
+
+ #endif // !CONFIG_COMPACT_FORMS
+
+ // Get the string format to use to render the text.
+ [TODO]
+ private StringFormat GetStringFormat()
+ {
+ StringFormat format = new StringFormat();
+ // TODO: adjust the format according to the
label's properties.
+ switch(RtlTranslateAlignment(TextAlign))
+ {
+ case ContentAlignment.TopLeft:
+ {
+ format.Alignment =
StringAlignment.Near;
+ format.LineAlignment =
StringAlignment.Near;
+ }
+ break;
+
+ case ContentAlignment.TopCenter:
+ {
+ format.Alignment =
StringAlignment.Center;
+ format.LineAlignment =
StringAlignment.Near;
+ }
+ break;
+
+ case ContentAlignment.TopRight:
+ {
+ format.Alignment =
StringAlignment.Far;
+ format.LineAlignment =
StringAlignment.Near;
+ }
+ break;
+
+ case ContentAlignment.MiddleLeft:
+ {
+ format.Alignment =
StringAlignment.Near;
+ format.LineAlignment =
StringAlignment.Center;
+ }
+ break;
+
+ case ContentAlignment.MiddleCenter:
+ {
+ format.Alignment =
StringAlignment.Center;
+ format.LineAlignment =
StringAlignment.Center;
+ }
+ break;
+
+ case ContentAlignment.MiddleRight:
+ {
+ format.Alignment =
StringAlignment.Far;
+ format.LineAlignment =
StringAlignment.Center;
}
+ break;
+
+ case ContentAlignment.BottomLeft:
+ {
+ format.Alignment =
StringAlignment.Near;
+ format.LineAlignment =
StringAlignment.Far;
+ }
+ break;
+
+ case ContentAlignment.BottomCenter:
+ {
+ format.Alignment =
StringAlignment.Center;
+ format.LineAlignment =
StringAlignment.Far;
+ }
+ break;
+
+ case ContentAlignment.BottomRight:
+ {
+ format.Alignment =
StringAlignment.Far;
+ format.LineAlignment =
StringAlignment.Far;
+ }
+ break;
}
+ if(UseMnemonic)
+ {
+ format.HotkeyPrefix = HotkeyPrefix.Show;
+ }
+ return format;
+ }
+
+ // Recalculate the preferred size of the label and then redraw it.
+ private void Recalculate()
+ {
+ // Recalculate the size and set it.
+ preferredWidth = -1;
+ if(AutoSize)
+ {
+ Size = new Size(PreferredWidth,
PreferredHeight);
+ }
+
+ // Force a repaint on the label.
+ Invalidate();
}
| [Prev in Thread] | Current Thread | [Next in Thread] |