[banshee] [ThickClient] Make DataViewChildAlbum a box
- From: Gabriel Burt <gburt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] [ThickClient] Make DataViewChildAlbum a box
- Date: Tue, 19 Oct 2010 23:34:29 +0000 (UTC)
commit 7916cd4f216fd013c10f79d264e75eb20b2a905a
Author: Gabriel Burt <gabriel burt gmail com>
Date: Tue Oct 19 15:28:56 2010 -0500
[ThickClient] Make DataViewChildAlbum a box
Have it use an image cell and two text cells, instead of custom
implementing the layout/measuring manually. This will let us add proper
tooltip support, per-cell interactivity, etc.
.../Banshee.Collection.Gui/DataViewChildAlbum.cs | 314 ++++---------------
1 files changed, 66 insertions(+), 248 deletions(-)
---
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DataViewChildAlbum.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DataViewChildAlbum.cs
index ada4cca..fb48f8a 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DataViewChildAlbum.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DataViewChildAlbum.cs
@@ -42,39 +42,69 @@ using Banshee.ServiceStack;
namespace Banshee.Collection.Gui
{
- public class DataViewChildAlbum : DataViewChild
+ public class DataViewChildAlbum : DataViewChildBox
{
- private static Stage<DataViewChildAlbum> stage = new Stage<DataViewChildAlbum> (250);
+ DataViewChildImage img;
- static DataViewChildAlbum ()
+ public DataViewChildAlbum ()
{
- stage.ActorStep += actor => {
- var alpha = actor.Target.prelight_opacity;
- alpha += actor.Target.prelight_in
- ? actor.StepDeltaPercent
- : -actor.StepDeltaPercent;
- actor.Target.prelight_opacity = alpha = Math.Max (0.0, Math.Min (1.0, alpha));
- actor.Target.InvalidateImage ();
- return alpha > 0 && alpha < 1;
- };
+ Horizontal = false;
+ Padding = new Thickness (5);
+
+ Add (
+ img = new DataViewChildImage (),
+
+ new ColumnCellText ("DisplayTitle", false) {
+ EllipsizeMode = Pango.EllipsizeMode.End,
+ UseMarkup = true,
+ TextFormat = "<small>{0}</small>",
+ Padding = new Thickness (2, 2, 2, 0)
+ },
+
+ // TODO hide for 'All Artists'
+ new ColumnCellText ("DisplayArtistName", false) {
+ EllipsizeMode = Pango.EllipsizeMode.End,
+ UseMarkup = true,
+ TextFormat = "<small>{0}</small>",
+ Padding = new Thickness (2, 0),
+ Alpha = 0.6
+ }
+ );
}
- private ArtworkManager artwork_manager;
+ public double ImageSize {
+ get { return img.ImageSize; }
+ set { img.ImageSize = value; }
+ }
- private bool prelight_in;
- private double prelight_opacity;
+#if false
+#region Accessibility
- private ImageSurface image_surface;
- private string [] lines;
+ private class ColumnCellAlbumAccessible : ColumnCellAccessible
+ {
+ public ColumnCellAlbumAccessible (object bound_object, ColumnCellAlbum cell, ICellAccessibleParent parent)
+ : base (bound_object, cell as ColumnCell, parent)
+ {
+ var bound_album_info = (AlbumInfo)bound_object;
+ Name = String.Format ("{0} - {1}", bound_album_info.DisplayTitle, bound_album_info.DisplayArtistName);
+ }
+ }
+
+ public override Atk.Object GetAccessible (ICellAccessibleParent parent)
+ {
+ return new ColumnCellAlbumAccessible (BoundObject, this, parent);
+ }
- private Rect inner_allocation;
- private Rect image_allocation;
- private Rect first_line_allocation;
- private Rect second_line_allocation;
+#endregion
+#endif
+
+ }
+
+ public class DataViewChildImage : DataViewChild
+ {
+ private ArtworkManager artwork_manager;
public double ImageSize { get; set; }
- public double ImageSpacing { get; set; }
- public double TextSpacing { get; set; }
private bool IsGridLayout {
// FIXME: Cache this after implementing virtual notification
@@ -82,251 +112,39 @@ namespace Banshee.Collection.Gui
get { return ParentLayout is DataViewLayoutGrid; }
}
- public DataViewChildAlbum ()
+ public DataViewChildImage ()
{
artwork_manager = ServiceManager.Get<ArtworkManager> ();
-
- Padding = new Thickness (5);
+ HasPrelight = true;
ImageSize = 90;
- ImageSpacing = 2;
- TextSpacing = 2;
- }
-
- public override void Arrange ()
- {
- if (!HandleBoundObject (out image_surface, out lines)) {
- return;
- }
-
- inner_allocation = new Rect () {
- X = Padding.Left,
- Y = Padding.Top,
- Width = Allocation.Width - Padding.X,
- Height = Allocation.Height - Padding.Y
- };
-
- double width = ImageSize;
- double height = ImageSize;
-
- if (image_surface != null) {
- width = image_surface.Width;
- height = image_surface.Height;
- }
-
- image_allocation = new Rect () {
- Width = Math.Min (inner_allocation.Width, width),
- Height = Math.Min (inner_allocation.Height, height)
- };
-
- if (IsGridLayout) {
- image_allocation.X = Math.Round ((inner_allocation.Width - width) / 2.0);
- } else {
- image_allocation.Y = Math.Round ((inner_allocation.Height - height) / 2.0);
- }
-
- double allocated_image_size = Math.Max (image_allocation.Height, image_allocation.Width);
- if (IsGridLayout) {
- first_line_allocation.Y = allocated_image_size + ImageSpacing;
- first_line_allocation.Width = second_line_allocation.Width = inner_allocation.Width;
- } else {
- first_line_allocation.X = second_line_allocation.X = allocated_image_size + ImageSpacing;
- first_line_allocation.Width = second_line_allocation.Width =
- inner_allocation.Width - allocated_image_size - ImageSpacing;
- }
-
- second_line_allocation.Y = first_line_allocation.Bottom + TextSpacing;
- }
-
- public override void Render (CellContext context)
- {
- if (inner_allocation.IsEmpty) {
- return;
- }
-
- // Need to call this again here to make sure we have the latest artwork
- var album = BoundObject as AlbumInfo;
- if (album != null) {
- image_surface = artwork_manager != null
- ? artwork_manager.LookupScaleSurface (album.ArtworkId, (int)ImageSize, true)
- : null;
- }
-
- context.Context.Translate (inner_allocation.X, inner_allocation.Y);
-
- RenderImageSurface (context, image_allocation, image_surface);
-
- // Render the overlay
- if (IsGridLayout && prelight_opacity > 0) {
- var cr = context.Context;
- var x = image_allocation.Width / 2.0;
- var y = image_allocation.Height / 2.0;
- var grad = new RadialGradient (x, y, 0, x, y, x);
- grad.AddColorStop (0, new Color (0, 0, 0, 0.1 * prelight_opacity));
- grad.AddColorStop (1, new Color (0, 0, 0, 0.35 * prelight_opacity));
- cr.Pattern = grad;
- CairoExtensions.RoundedRectangle (cr, image_allocation.X, image_allocation.Y,
- image_allocation.Width, image_allocation.Height, context.Theme.Context.Radius);
- cr.Fill ();
- grad.Destroy ();
-
- /*cr.Save ();
- cr.LineWidth = 2;
- cr.Antialias = Cairo.Antialias.Default;
-
- // math prep for rendering multiple controls...
- double max_controls = 3;
- double spacing = 4;
- double radius = (width - ((max_controls + 1) * spacing)) / max_controls / 2;
-
- // render first control
- cr.Arc (width / 2, height - radius - 2 * spacing, radius, 0, 2 * Math.PI);
-
- cr.Color = new Color (0, 0, 0, 0.4);
- cr.FillPreserve ();
- cr.Color = new Color (1, 1, 1, 0.8);
- cr.Stroke ();
-
- cr.Restore ();*/
- }
-
- if (lines == null || lines.Length < 2) {
- return;
- }
-
- var text_color = context.Theme.Colors.GetWidgetColor (GtkColorClass.Text, context.State);
-
- var layout = context.Layout;
- layout.Ellipsize = Pango.EllipsizeMode.End;
- layout.Width = (int)(first_line_allocation.Width * Pango.Scale.PangoScale);
-
- int normal_size = layout.FontDescription.Size;
- int small_size = (int)(normal_size * Pango.Scale.Small);
-
- if (!String.IsNullOrEmpty (lines[0])) {
- layout.FontDescription.Size = small_size;
- layout.SetText (lines[0]);
-
- context.Context.Color = text_color;
- context.Context.MoveTo (first_line_allocation.X, first_line_allocation.Y);
- PangoCairoHelper.ShowLayout (context.Context, layout);
- }
-
- if (!String.IsNullOrEmpty (lines[1])) {
- layout.FontDescription.Weight = Pango.Weight.Normal;
- layout.FontDescription.Size = small_size;
- layout.SetText (lines[1]);
-
- text_color.A = 0.60;
- context.Context.Color = text_color;
- context.Context.MoveTo (second_line_allocation.X, second_line_allocation.Y);
- PangoCairoHelper.ShowLayout (context.Context, layout);
- }
-
- layout.FontDescription.Size = normal_size;
}
public override Size Measure (Size available)
{
- var widget = ParentLayout.View;
-
- var fd = widget.PangoContext.FontDescription;
- int normal_size = fd.Size;
-
- fd.Size = (int)(fd.Size * Pango.Scale.Small);
- first_line_allocation.Height = fd.MeasureTextHeight (widget.PangoContext);
-
- fd.Weight = Pango.Weight.Normal;
- fd.Size = (int)(fd.Size * Pango.Scale.Small);
- second_line_allocation.Height = fd.MeasureTextHeight (widget.PangoContext);
-
- fd.Size = normal_size;
-
- double width, height;
- double text_height = first_line_allocation.Height + second_line_allocation.Height;
-
- if (IsGridLayout) {
- width = ImageSize + Padding.X;
- height = ImageSize + ImageSpacing + TextSpacing + text_height + Padding.Y;
- } else {
- double list_text_height = text_height + TextSpacing;
- width = ImageSize + ImageSpacing + Padding.Y;
- height = (list_text_height < ImageSize ? ImageSize : list_text_height) + Padding.X;
- }
-
- return new Size (Math.Round (width), Math.Round (height));
+ return new Size (ImageSize, ImageSize);
}
- protected void InvalidateImage ()
- {
- var damage = image_allocation;
- damage.Offset (inner_allocation);
- Invalidate (damage);
- }
-
- protected virtual void RenderImageSurface (CellContext context, Rect allocation, ImageSurface imageSurface)
+ public override void Arrange ()
{
- ArtworkRenderer.RenderThumbnail (context.Context,
- imageSurface, false,
- allocation.X, allocation.Y, allocation.Width, allocation.Height,
- true, context.Theme.Context.Radius,
- imageSurface == null, new Color (0.8, 0.8, 0.8));
}
- protected virtual bool HandleBoundObject (out ImageSurface image, out string [] lines)
+ protected override void RenderCore (CellContext context)
{
- image = null;
- lines = null;
-
var album = BoundObject as AlbumInfo;
if (album == null) {
- if (BoundObject == null) {
- return false;
- };
-
- throw new InvalidCastException ("ColumnCellAlbum can only bind to AlbumInfo objects");
+ return;
}
- bool hide_artist = ModelRowIndex == 0 && String.IsNullOrEmpty (album.ArtistName);
- lines = new [] { album.DisplayTitle, hide_artist ? "" : album.DisplayArtistName };
- image = artwork_manager != null
+ var image_surface = artwork_manager != null
? artwork_manager.LookupScaleSurface (album.ArtworkId, (int)ImageSize, true)
: null;
- return true;
- }
-
- public override void CursorEnterEvent ()
- {
- prelight_in = true;
- stage.AddOrReset (this);
- }
-
- public override void CursorLeaveEvent ()
- {
- prelight_in = false;
- stage.AddOrReset (this);
- }
-
-#if false
-#region Accessibility
-
- private class ColumnCellAlbumAccessible : ColumnCellAccessible
- {
- public ColumnCellAlbumAccessible (object bound_object, ColumnCellAlbum cell, ICellAccessibleParent parent)
- : base (bound_object, cell as ColumnCell, parent)
- {
- var bound_album_info = (AlbumInfo)bound_object;
- Name = String.Format ("{0} - {1}", bound_album_info.DisplayTitle, bound_album_info.DisplayArtistName);
- }
- }
-
- public override Atk.Object GetAccessible (ICellAccessibleParent parent)
- {
- return new ColumnCellAlbumAccessible (BoundObject, this, parent);
+ ArtworkRenderer.RenderThumbnail (context.Context,
+ image_surface, false,
+ 0, 0, Allocation.Width, Allocation.Height,
+ true, context.Theme.Context.Radius,
+ image_surface == null, new Color (0.8, 0.8, 0.8)
+ );
}
-
-#endregion
-#endif
-
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
