[gnome-shell] checkBox: Remove height-for-width hack
- From: Florian Müllner <fmuellner src gnome org>
 
- To: commits-list gnome org
 
- Cc: 
 
- Subject: [gnome-shell] checkBox: Remove height-for-width hack
 
- Date: Tue, 20 Aug 2013 06:40:50 +0000 (UTC)
 
commit c5dfc432d90c88a3d67e3e702a497329203d0baa
Author: Florian Müllner <fmuellner gnome org>
Date:   Thu Jul 4 02:57:32 2013 +0200
    checkBox: Remove height-for-width hack
    
    With the move to ClutterBoxLayout, height-for-width should now
    work properly, so remove this old hack.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=703811
 js/ui/checkBox.js |   14 --------------
 1 files changed, 0 insertions(+), 14 deletions(-)
---
diff --git a/js/ui/checkBox.js b/js/ui/checkBox.js
index 06b4367..097fe96 100644
--- a/js/ui/checkBox.js
+++ b/js/ui/checkBox.js
@@ -42,12 +42,6 @@ const CheckBoxContainer = new Lang.Class({
     },
 
     _getPreferredHeight: function(actor, forWidth, alloc) {
-        /* FIXME: StBoxlayout currently does not handle
-           height-for-width children correctly, so hard-code
-           two lines for the label until that problem is fixed.
-
-           https://bugzilla.gnome.org/show_bug.cgi?id=672543 */
-/*
         let [minBoxHeight, natBoxHeight] =
             this._box.get_preferred_height(forWidth);
         let [minLabelHeight, natLabelHeight] =
@@ -55,14 +49,6 @@ const CheckBoxContainer = new Lang.Class({
 
         alloc.min_size = Math.max(minBoxHeight, minLabelHeight);
         alloc.natural_size = Math.max(natBoxHeight, natLabelHeight);
-*/
-        let [minBoxHeight, natBoxHeight] =
-            this._box.get_preferred_height(-1);
-        let [minLabelHeight, natLabelHeight] =
-            this.label.get_preferred_height(-1);
-
-        alloc.min_size = Math.max(minBoxHeight, 2 * minLabelHeight);
-        alloc.natural_size = Math.max(natBoxHeight, 2 * natLabelHeight);
     },
 
     _allocate: function(actor, box, flags) {
[
Date Prev][
Date Next]   [
Thread Prev][
Thread Next]   
[
Thread Index]
[
Date Index]
[
Author Index]