From 3e8cbdfba291e6d1e7014cd1f3732c6e879b306b Mon Sep 17 00:00:00 2001 From: ThomasV <thomasv@electrum.org> Date: Tue, 13 Oct 2015 22:44:43 +0200 Subject: [PATCH] kivy: improve layouts --- gui/kivy/uix/ui_screens/password.kv | 12 ++++++------ gui/kivy/uix/ui_screens/settings.kv | 14 ++++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/gui/kivy/uix/ui_screens/password.kv b/gui/kivy/uix/ui_screens/password.kv index bdc3db38d..dcec7c56d 100644 --- a/gui/kivy/uix/ui_screens/password.kv +++ b/gui/kivy/uix/ui_screens/password.kv @@ -5,23 +5,23 @@ Popup: BoxLayout: orientation: 'vertical' - size_hint: 1, None GridLayout: - size_hint: 1, None cols: 2 Label: text: 'Password' + size_hint: 1, None height: '48dp' TextInput: id: text_input - password:True - + size_hint: 1, None + password: True + multiline: False Button: - size_hint_y: None + size_hint: 1, None height: '48dp' text: _('Close') on_release: pw.dismiss() Widget: - size_hint_y: 1 + size_hint: 1, 1 diff --git a/gui/kivy/uix/ui_screens/settings.kv b/gui/kivy/uix/ui_screens/settings.kv index 216d8b5ba..10f6a8e86 100644 --- a/gui/kivy/uix/ui_screens/settings.kv +++ b/gui/kivy/uix/ui_screens/settings.kv @@ -5,7 +5,6 @@ Popup: BoxLayout: orientation: 'vertical' - size_hint: 1, None GridLayout: cols: 2 @@ -16,6 +15,7 @@ Popup: Spinner: text: 'BTC' values: ('BTC', 'mBTC') + size_hint: 1, None height: '48dp' Label: @@ -24,12 +24,14 @@ Popup: height: '48dp' TextInput: size_hint: 1, None - - + height: '48dp' + multiline: False Button: - #size_hint_y: None + size_hint: 1, None height: '48dp' text: _('Close') on_release: settings.dismiss() - #Widget: - # size_hint_y: None + + Widget: + size_hint: 1, 1 +