[hyena: 88/89] Revert "ListView: carry out a TODO in ListView_Rendering::PaintList()"



commit 5ced332178e920d8ce40ecba111d8fe94bd756cf
Author: Andrés G. Aragoneses <knocte gmail com>
Date:   Mon Sep 9 13:36:17 2013 +0200

    Revert "ListView: carry out a TODO in ListView_Rendering::PaintList()"
    
    This reverts commit 13fa671f49a382f0947f8fe106011267b1d89407, as it
    would likely cause a conflict when merging the gtk3 branch into master.
    I will re-apply it later manually.

 .../Hyena.Data.Gui/ListView/ListView_Rendering.cs  |   24 ++++++-------------
 1 files changed, 8 insertions(+), 16 deletions(-)
---
diff --git a/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs 
b/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs
index 51355a3..dd0cca8 100644
--- a/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs
+++ b/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs
@@ -265,28 +265,20 @@ namespace Hyena.Data.Gui
 
 #region List Rendering
 
-        void RenderDarkBackgroundInSortedColumn ()
-        {
-            if (pressed_column_is_dragging && pressed_column_index == sort_column_index) {
-                return;
-            }
-
-            CachedColumn col = column_cache [sort_column_index];
-            Theme.DrawRowRule (cairo_context,
-                               list_rendering_alloc.X + col.X1 - HadjustmentValue,
-                               header_rendering_alloc.Bottom + Theme.BorderWidth,
-                               col.Width,
-                               list_rendering_alloc.Height + Theme.InnerBorderWidth * 2);
-        }
-
         private void PaintList (Rectangle clip)
         {
             if (ChildSize.Height <= 0) {
                 return;
             }
 
-            if (sort_column_index != -1) {
-                RenderDarkBackgroundInSortedColumn ();
+            // TODO factor this out?
+            // Render the sort effect to the GdkWindow.
+            if (sort_column_index != -1 && (!pressed_column_is_dragging || pressed_column_index != 
sort_column_index)) {
+                CachedColumn col = column_cache[sort_column_index];
+                Theme.DrawRowRule (cairo_context,
+                    list_rendering_alloc.X + col.X1 - HadjustmentValue,
+                    header_rendering_alloc.Bottom + Theme.BorderWidth,
+                    col.Width, list_rendering_alloc.Height + Theme.InnerBorderWidth * 2);
             }
 
             clip.Intersect (list_rendering_alloc);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]