AaronFiore/electrum
1
0
Fork 0
Code Activity

kivy history tab: allow scrolling with bar

Browse Source 
follow kivy/kivy@0edae84139
This commit is contained in:
SomberNight
2018-06-19 14:19:36 +02:00
parent 4018bd12bd
commit 12af2dc63b
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gui/kivy/data/style.kv
View File

@@ -691,17 +691,21 @@
<ScrollView>: <ScrollView>:
_handle_y_pos: (self.right - self.bar_width - self.bar_margin) if self.bar_pos_y == 'right' else (self.x + self.bar_margin), self.y + self.height * self.vbar[0]
_handle_y_size: min(self.bar_width, self.width), self.height * self.vbar[1]
_handle_x_pos: self.x + self.width * self.hbar[0], (self.y + self.bar_margin) if self.bar_pos_x == 'bottom' else (self.top - self.bar_margin - self.bar_width)
_handle_x_size: self.width * self.hbar[1], min(self.bar_width, self.height)
canvas.after: canvas.after:
Color: Color:
rgba: self._bar_color if (self.do_scroll_y and self.viewport_size[1] > self.height) else [0, 0, 0, 0] rgba: self._bar_color if (self.do_scroll_y and self.viewport_size[1] > self.height) else [0, 0, 0, 0]
Rectangle: Rectangle:
pos: (self.right - self.bar_width - self.bar_margin) if self.bar_pos_y == 'right' else (self.x + self.bar_margin), self.y + self.height * self.vbar[0] pos: root._handle_y_pos or (0, 0)
size: min(self.bar_width, self.width), self.height * self.vbar[1] size: root._handle_y_size or (0, 0)
Color: Color:
rgba: self._bar_color if (self.do_scroll_x and self.viewport_size[0] > self.width) else [0, 0, 0, 0] rgba: self._bar_color if (self.do_scroll_x and self.viewport_size[0] > self.width) else [0, 0, 0, 0]
Rectangle: Rectangle:
pos: self.x + self.width * self.hbar[0], (self.y + self.bar_margin) if self.bar_pos_x == 'bottom' else (self.top - self.bar_margin - self.bar_width) pos: root._handle_x_pos or (0, 0)
size: self.width * self.hbar[1], min(self.bar_width, self.height) size: root._handle_x_size or (0, 0)
<CheckBox>: <CheckBox>:

2
gui/kivy/uix/ui_screens/history.kv
View File

@@ -68,6 +68,8 @@ HistoryScreen:
id: content id: content
do_scroll_x: False do_scroll_x: False
size_hint: 1, 0.75 size_hint: 1, 0.75
scroll_type: ['bars', 'content']
bar_width: 15
GridLayout GridLayout
id: history_container id: history_container
cols: 1 cols: 1