tkivy: fix layout of addresses dialog - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit c2f9c5fb1b084312219b9000cc00c13f23a3c6d5
DIR parent eadd5d58e83a9e40e042fbfb4267e9fb603b55ac
HTML Author: ThomasV <thomasv@electrum.org>
Date: Thu, 5 Mar 2020 12:06:30 +0100
kivy: fix layout of addresses dialog
Diffstat:
M electrum/gui/kivy/main.kv | 19 -------------------
M electrum/gui/kivy/uix/dialogs/addr… | 24 ++++++++++++++++++++++--
2 files changed, 22 insertions(+), 21 deletions(-)
---
DIR diff --git a/electrum/gui/kivy/main.kv b/electrum/gui/kivy/main.kv
t@@ -285,25 +285,6 @@
size: self.size
pos: self.pos
-<AddressButton@Button>:
- background_color: 1, .585, .878, 0
- halign: 'center'
- text_size: (self.width, None)
- shorten: True
- size_hint: 0.5, None
- default_text: ''
- text: self.default_text
- padding: '5dp', '5dp'
- height: '40dp'
- text_color: self.foreground_color
- disabled_color: 1, 1, 1, 1
- foreground_color: 1, 1, 1, 1
- canvas.before:
- Color:
- rgba: (0.9, .498, 0.745, 1) if self.state == 'down' else self.background_color
- Rectangle:
- size: self.size
- pos: self.pos
<KButton@Button>:
size_hint: 1, None
DIR diff --git a/electrum/gui/kivy/uix/dialogs/addresses.py b/electrum/gui/kivy/uix/dialogs/addresses.py
t@@ -41,6 +41,26 @@ Builder.load_string('''
shorten: True
Widget
+<AddressButton@Button>:
+ background_color: 1, .585, .878, 0
+ halign: 'center'
+ text_size: (self.width, None)
+ shorten: True
+ size_hint: 0.5, None
+ default_text: ''
+ text: self.default_text
+ padding: '5dp', '5dp'
+ height: '40dp'
+ text_color: self.foreground_color
+ disabled_color: 1, 1, 1, 1
+ foreground_color: 1, 1, 1, 1
+ canvas.before:
+ Color:
+ rgba: (0.9, .498, 0.745, 1) if self.state == 'down' else self.background_color
+ Rectangle:
+ size: self.size
+ pos: self.pos
+
<AddressesDialog@Popup>
id: popup
title: _('Addresses')
t@@ -52,12 +72,12 @@ Builder.load_string('''
self.update()
BoxLayout:
id:box
- padding: '12dp', '70dp', '12dp', '12dp'
+ padding: '12dp', '12dp', '12dp', '12dp'
spacing: '12dp'
orientation: 'vertical'
- size_hint: 1, 1.1
BoxLayout:
spacing: '6dp'
+ height: self.minimum_height
size_hint: 1, None
orientation: 'horizontal'
AddressFilter: