This commit is contained in:
yumoqing 2021-06-24 13:58:21 +08:00
parent 86e7ad89f6
commit a73f99901c
2 changed files with 11 additions and 6 deletions

View File

@ -310,6 +310,7 @@ class MarkdownBody(VBox):
t = self.mktext2bbtext(l[2:]) t = self.mktext2bbtext(l[2:])
return self.parse_title(t,1) return self.parse_title(t,1)
t = self.mktext2bbtext(l) t = self.mktext2bbtext(l)
print('markdown.py, t=', t, 'len(t)=', len(t), 'type(t)=', type(t))
w = Factory.Blocks().widgetBuild({ w = Factory.Blocks().widgetBuild({
"widgettype":"Text", "widgettype":"Text",
"options":{ "options":{

View File

@ -31,11 +31,15 @@ class Conform(Modal):
valign='center', valign='center',
)) ))
b.add_widget(b1) b.add_widget(b1)
b.add_widget(Text(text=message or 'Please conform', b2 = HBox()
b2.add_widget(Text(text=message or 'Please conform',
wrap=True, wrap=True,
halign='left', halign='left',
size_hint=(1,1),
font_size=CSize(1))) font_size=CSize(1)))
b1 = HBox(size_hint_y=None, height=CSize(1.2)) b.add_widget(b2)
b3 = HBox(size_hint_y=None, height=CSize(2))
w_cancel = PressableBox() w_cancel = PressableBox()
blocks = Factory.Blocks() blocks = Factory.Blocks()
w_cancel.add_widget(blocks.widgetBuild({ w_cancel.add_widget(blocks.widgetBuild({
@ -72,7 +76,7 @@ class Conform(Modal):
{ {
"widgettype":"AsyncImage", "widgettype":"AsyncImage",
"options":{ "options":{
"source":cancel_icon or blockImage('conform.png'), "source":conform_icon or blockImage('conform.png'),
"size_hint":[None,None], "size_hint":[None,None],
"height":CSize(1), "height":CSize(1),
"width":CSize(1) "width":CSize(1)
@ -94,9 +98,9 @@ class Conform(Modal):
w_cancel.bind(on_press=self.cancel_press) w_cancel.bind(on_press=self.cancel_press)
w_conform.bind(on_press=self.conform_press) w_conform.bind(on_press=self.conform_press)
b1.add_widget(w_cancel) b3.add_widget(w_cancel)
b1.add_widget(w_conform) b3.add_widget(w_conform)
b.add_widget(b1) b.add_widget(b3)
self.add_widget(b) self.add_widget(b)
def cancel_press(self,o, v=None): def cancel_press(self,o, v=None):