Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

Commit

Permalink
2008-04-10 Mike Kestner <mkestner@novell.com>
Browse files Browse the repository at this point in the history 
	* src/BannerItem.cs: 
	* src/HeadingItem.cs: 
	* src/LabelItem.cs: 
	* src/LinkItem.cs: 
	* src/MarkupItem.cs: 
	* src/RemarksItem.cs: 
	* src/SummaryTableItem.cs: Layout tweaks adapting to ink rect 
	offsets.

svn path=/trunk/monodoc-widgets/; revision=100359
  • Loading branch information
@mkestner
mkestner committed Apr 10, 2008
1 parent 2713cb9 commit a5bfee9
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 8 deletions.
11 changes: 11 additions & 0 deletions ChangeLog
View file
@@ -1,3 +1,14 @@
2008-04-10 Mike Kestner <mkestner@novell.com>

* src/BannerItem.cs:
* src/HeadingItem.cs:
* src/LabelItem.cs:
* src/LinkItem.cs:
* src/MarkupItem.cs:
* src/RemarksItem.cs:
* src/SummaryTableItem.cs: Layout tweaks adapting to ink rect
offsets.

2008-04-10 Mike Kestner <mkestner@novell.com> 2008-04-10 Mike Kestner <mkestner@novell.com>


* src/DocView.cs : add size request support to enable scrolling. * src/DocView.cs : add size request support to enable scrolling.
Expand Down
2 changes: 1 addition & 1 deletion src/BannerItem.cs
View file
Expand Up @@ -66,7 +66,7 @@ public override void Update (int width)
height += view.LineHeight; height += view.LineHeight;
heading.Update (width); heading.Update (width);
heading.Location = new Gdk.Point (Padding, height); heading.Location = new Gdk.Point (Padding, height);
sz.Height = height + heading.Size.Height + 2 * Padding; sz.Height = height + heading.Size.Height + Padding;
} }


protected override void OnPaint (Gdk.Drawable win, Gdk.Point offset, Gdk.Rectangle clip) protected override void OnPaint (Gdk.Drawable win, Gdk.Point offset, Gdk.Rectangle clip)
Expand Down
5 changes: 4 additions & 1 deletion src/HeadingItem.cs
View file
Expand Up @@ -53,6 +53,8 @@ public HeadingItem (DocView view, string heading)
} }
} }


Gdk.Point ink_offset;

public override void Update (int width) public override void Update (int width)
{ {
Layout layout = view.Layout; Layout layout = view.Layout;
Expand All @@ -62,6 +64,7 @@ public override void Update (int width)
layout.SetText (heading); layout.SetText (heading);
Rectangle ink, log; Rectangle ink, log;
layout.GetPixelExtents (out ink, out log); layout.GetPixelExtents (out ink, out log);
ink_offset = new Gdk.Point (ink.X, ink.Y);
layout.FontDescription = null; layout.FontDescription = null;
sz.Width = ink.Width; sz.Width = ink.Width;
sz.Height = ink.Height; sz.Height = ink.Height;
Expand All @@ -74,7 +77,7 @@ protected override void OnPaint (Gdk.Drawable win, Gdk.Point offset, Gdk.Rectang
layout.Alignment = Pango.Alignment.Left; layout.Alignment = Pango.Alignment.Left;
layout.Width = -1; layout.Width = -1;
layout.SetText (heading); layout.SetText (heading);
win.DrawLayout (view.Style.TextGC (0), Location.X + offset.X, Location.Y + offset.Y, layout); win.DrawLayout (view.Style.TextGC (0), Location.X + offset.X - ink_offset.X, Location.Y + offset.Y - ink_offset.Y, layout);
layout.FontDescription = null; layout.FontDescription = null;
} }


Expand Down
5 changes: 4 additions & 1 deletion src/LabelItem.cs
View file
Expand Up @@ -63,10 +63,12 @@ protected override void OnPaint (Gdk.Drawable win, Gdk.Point offset, Gdk.Rectang
layout.Alignment = Pango.Alignment.Left; layout.Alignment = Pango.Alignment.Left;
layout.Width = -1; layout.Width = -1;
layout.SetText (text); layout.SetText (text);
win.DrawLayout (view.Style.TextGC (0), Location.X + offset.X, Location.Y + offset.Y, layout); win.DrawLayout (view.Style.TextGC (0), Location.X + offset.X - ink_offset.X, Location.Y + offset.Y - ink_offset.Y, layout);
layout.FontDescription = null; layout.FontDescription = null;
} }


Gdk.Point ink_offset;

public override void Update (int width) public override void Update (int width)
{ {
Layout layout = view.Layout; Layout layout = view.Layout;
Expand All @@ -76,6 +78,7 @@ public override void Update (int width)
layout.SetText (text); layout.SetText (text);
Rectangle ink, log; Rectangle ink, log;
layout.GetPixelExtents (out ink, out log); layout.GetPixelExtents (out ink, out log);
ink_offset = new Gdk.Point (ink.X, ink.Y);
layout.FontDescription = null; layout.FontDescription = null;
sz.Width = ink.Width; sz.Width = ink.Width;
sz.Height = ink.Height; sz.Height = ink.Height;
Expand Down
5 changes: 4 additions & 1 deletion src/LinkItem.cs
View file
Expand Up @@ -64,14 +64,16 @@ public override void Event (EventInfo info)
} }
} }


Gdk.Point ink_offset;

protected override void OnPaint (Gdk.Drawable win, Gdk.Point offset, Gdk.Rectangle clip) protected override void OnPaint (Gdk.Drawable win, Gdk.Point offset, Gdk.Rectangle clip)
{ {
Pango.Layout layout = view.Layout; Pango.Layout layout = view.Layout;
layout.Alignment = Pango.Alignment.Left; layout.Alignment = Pango.Alignment.Left;
layout.Width = -1; layout.Width = -1;
layout.SetText (caption); layout.SetText (caption);
layout.Attributes = Attrs; layout.Attributes = Attrs;
win.DrawLayout (view.Style.TextGC (0), Location.X + offset.X, Location.Y + offset.Y, layout); win.DrawLayout (view.Style.TextGC (0), Location.X + offset.X - ink_offset.X, Location.Y + offset.Y - ink_offset.Y, layout);
layout.Attributes = null; layout.Attributes = null;
} }


Expand All @@ -84,6 +86,7 @@ public override void Update (int width)
layout.SetText (caption); layout.SetText (caption);
Rectangle ink, log; Rectangle ink, log;
layout.GetPixelExtents (out ink, out log); layout.GetPixelExtents (out ink, out log);
ink_offset = new Gdk.Point (ink.X, ink.Y);
sz.Width = ink.Width; sz.Width = ink.Width;
sz.Height = ink.Height; sz.Height = ink.Height;
layout.Attributes = null; layout.Attributes = null;
Expand Down
5 changes: 4 additions & 1 deletion src/MarkupItem.cs
View file
Expand Up @@ -109,6 +109,8 @@ void InsertSeeAttrs (uint start, uint end)
attrs.Insert (attr); attrs.Insert (attr);
} }


Gdk.Point ink_offset;

public override void Update (int width) public override void Update (int width)
{ {
sz.Width = width; sz.Width = width;
Expand All @@ -120,6 +122,7 @@ public override void Update (int width)
layout.SetText (text); layout.SetText (text);
Rectangle ink, log; Rectangle ink, log;
layout.GetPixelExtents (out ink, out log); layout.GetPixelExtents (out ink, out log);
ink_offset = new Gdk.Point (ink.X, ink.Y);
sz.Height = ink.Height; sz.Height = ink.Height;
layout.Attributes = null; layout.Attributes = null;
} }
Expand All @@ -132,7 +135,7 @@ protected override void OnPaint (Gdk.Drawable win, Gdk.Point offset, Gdk.Rectang
if (attrs != null) if (attrs != null)
layout.Attributes = attrs; layout.Attributes = attrs;
layout.SetText (text); layout.SetText (text);
win.DrawLayout (view.Style.TextGC (0), Location.X + offset.X, Location.Y + offset.Y, layout); win.DrawLayout (view.Style.TextGC (0), Location.X + offset.X - ink_offset.X, Location.Y + offset.Y - ink_offset.Y, layout);
layout.Attributes = null; layout.Attributes = null;
} }


Expand Down
3 changes: 1 addition & 2 deletions src/RemarksItem.cs
View file
Expand Up @@ -42,7 +42,6 @@ public RemarksItem (DocView view, XmlElement elem)
contents = new KitchenSinkItem (view, elem); contents = new KitchenSinkItem (view, elem);
} }


const int text_padding = 6;
const int item_offset = 14; const int item_offset = 14;


public override void Update (int width) public override void Update (int width)
Expand All @@ -51,7 +50,7 @@ public override void Update (int width)
label.Update (width); label.Update (width);
label.Location = Gdk.Point.Zero; label.Location = Gdk.Point.Zero;
width -= item_offset; width -= item_offset;
int height = label.Size.Height + text_padding; int height = label.Size.Height + Padding;
contents.Update (width); contents.Update (width);
contents.Location = new Gdk.Point (item_offset, height); contents.Location = new Gdk.Point (item_offset, height);
sz.Height = height + contents.Size.Height; sz.Height = height + contents.Size.Height;
Expand Down
2 changes: 1 addition & 1 deletion src/SummaryTableItem.cs
View file
Expand Up @@ -161,7 +161,7 @@ public override void Update (int width)
protected override void OnPaint (Gdk.Drawable win, Gdk.Point offset, Gdk.Rectangle clip) protected override void OnPaint (Gdk.Drawable win, Gdk.Point offset, Gdk.Rectangle clip)
{ {
Gdk.Point adj = Globalize (offset); Gdk.Point adj = Globalize (offset);
Gtk.Style.PaintExpander (view.Style, win, Gtk.StateType.Normal, clip, view, null, adj.X + 10, adj.Y + 10, expanded ? Gtk.ExpanderStyle.Expanded : Gtk.ExpanderStyle.Collapsed); Gtk.Style.PaintExpander (view.Style, win, Gtk.StateType.Normal, clip, view, null, adj.X + 10, adj.Y + 6, expanded ? Gtk.ExpanderStyle.Expanded : Gtk.ExpanderStyle.Collapsed);
label.Paint (win, adj, clip); label.Paint (win, adj, clip);


if (!expanded) if (!expanded)
Expand Down

0 comments on commit a5bfee9

Please sign in to comment.