isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checkBox: Remove height-for-width hack

Browse Source 
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
This commit is contained in:
Florian Müllner 2013-07-04 02:57:32 +02:00
parent 144f7d6813
commit c5dfc432d9
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/ui/checkBox.js
View File

@ -42,12 +42,6 @@ const CheckBoxContainer = new Lang.Class({
}, },
_getPreferredHeight: function(actor, forWidth, alloc) { _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] = let [minBoxHeight, natBoxHeight] =
this._box.get_preferred_height(forWidth); this._box.get_preferred_height(forWidth);
let [minLabelHeight, natLabelHeight] = let [minLabelHeight, natLabelHeight] =
@ -55,14 +49,6 @@ const CheckBoxContainer = new Lang.Class({
alloc.min_size = Math.max(minBoxHeight, minLabelHeight); alloc.min_size = Math.max(minBoxHeight, minLabelHeight);
alloc.natural_size = Math.max(natBoxHeight, natLabelHeight); 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) { _allocate: function(actor, box, flags) {