Merge lp:~ken-vandine/ubuntu-system-settings/rtm-1376763 into lp:ubuntu-system-settings/rtm-14.09

[Ken VanDine]

Remove the dialog internals resizing hack

Remove the dialog internals resizing hack

[Sebastien Bacher (seb128)]

Thanks, that was depending of having an uitk bug fixed, did that happen in the rtm serie? should be update the uitk depends?

review: Needs Information

[Ken VanDine (ken-vandine)]

The uitk fix landed in rtm over a month ago, not sure the specific version. It landed in rtm at least a month before hitting vivid

[Sebastien Bacher (seb128)]

Ok, let's land that then ;-)

review: Approve

[Sebastien Bacher (seb128)]

seems like we are not doing more rtm landing, so cleaning the list a bit, that one is rather going to be including with the vivid rebase

Unmerged revisions

940. By Ken VanDine on 2014-11-18

Remove the dialog internals resizing hack

=== modified file 'plugins/wifi/OtherNetwork.qml'
--- plugins/wifi/OtherNetwork.qml	2014-09-18 16:48:38 +0000
+++ plugins/wifi/OtherNetwork.qml	2014-11-18 19:10:46 +0000
@@ -31,51 +31,6 @@
         objectName: "otherNetworkDialog"
         anchorToKeyboard: true
 
-        /* The following is a (bad) workaround for bugs
-            #1337556
-            #1337555
-
-            If the Dialog does not shrink after a user chooses e.g. WPA,
-            the anchorToKeyboard setting of OrientationHelper have no effect,
-            since the dialog never shrinks in size.
-
-            This workaround resizes the Dialog.
-        */
-
-        property int dialogVisualsHeight
-        function getVisibleChildren () {
-            var children = [feedback, networknameLabel, networkname,
-                securityListLabel, securityList, passwordListLabel,
-                password, passwordVisiblityRow, buttonRow];
-            var ret = [];
-            children.forEach(function (child) {
-                if (child.visible) {
-                    ret.push(child);
-                }
-            });
-            return ret;
-        }
-
-        function getVisibleChildrenHeight () {
-            var h = 0;
-            getVisibleChildren().forEach(function (child) {
-                h = h + child.height;
-            });
-            return h;
-        }
-
-        Component.onCompleted: {
-            dialogVisualsHeight =
-                __foreground.height - getVisibleChildrenHeight();
-        }
-
-        Binding {
-            target: __foreground
-            property: "height"
-            value: dialogVisualsHeight + getVisibleChildrenHeight()
-            when: dialogVisualsHeight
-        }
-
         function settingsValid() {
             if(networkname.length == 0) {
                 return false;