Merge pull request #1681 from akshayaurora/grid_bug

use BoxLabel workaround Gridlayout bug with col: 2
This commit is contained in:
ThomasV 2016-02-18 04:49:37 +01:00
commit 70fbebe8a1
1 changed files with 24 additions and 17 deletions

View File

@ -9,7 +9,19 @@ from electrum_gui.kivy.i18n import _
from datetime import datetime from datetime import datetime
Builder.load_string(''' Builder.load_string('''
<TxDialog@Popup> <BoxLabel@BoxLayout>
text: ''
value: ''
size_hint_y: None
height: max(lbl1.height, lbl2.height)
TopLabel
id: lbl1
text: root.text
TopLabel
id: lbl2
text: root.value
<TxDialog>
id: popup id: popup
title: _('Transaction') title: _('Transaction')
is_mine: True is_mine: True
@ -34,28 +46,23 @@ Builder.load_string('''
GridLayout: GridLayout:
height: self.minimum_height height: self.minimum_height
size_hint_y: None size_hint_y: None
cols: 2 cols: 1
spacing: '10dp' spacing: '10dp'
TopLabel: BoxLabel:
text: _('Status') text: _('Status')
TopLabel: value: root.status_str
text: root.status_str BoxLabel:
TopLabel:
text: _('Description') if root.description else '' text: _('Description') if root.description else ''
TopLabel: value: root.description
text: root.description BoxLabel:
TopLabel:
text: _('Date') if root.date_str else '' text: _('Date') if root.date_str else ''
TopLabel: value: root.date_str
text: root.date_str BoxLabel:
TopLabel:
text: _('Amount sent') if root.is_mine else _('Amount received') text: _('Amount sent') if root.is_mine else _('Amount received')
TopLabel: value: root.amount_str
text: root.amount_str BoxLabel:
TopLabel:
text: _('Transaction fee') if root.fee_str else '' text: _('Transaction fee') if root.fee_str else ''
TopLabel: value: root.fee_str
text: root.fee_str
TopLabel: TopLabel:
text: _('Outputs') + ':' text: _('Outputs') + ':'
OutputList: OutputList: