This commit is contained in:
yumoqing 2021-06-22 14:44:17 +08:00
parent 9cb2b916eb
commit 86e7ad89f6
2 changed files with 5 additions and 3 deletions

View File

@ -20,7 +20,7 @@ from appPublic.myTE import string_template_render
from .utils import CSize, setSizeOptions, loading, loaded, absurl, alert from .utils import CSize, setSizeOptions, loading, loaded, absurl, alert
from .baseWidget import Text, HBox, VBox from .baseWidget import Text, HBox, VBox
from .widgetExt import ScrollWidget from .scrollpanel import ScrollPanel
from .paging import Paging, RelatedLoader from .paging import Paging, RelatedLoader
from .ready import WidgetReady from .ready import WidgetReady
from .toolbar import Toolbar from .toolbar import Toolbar
@ -155,7 +155,7 @@ class Row(BoxLayout):
self.part.datagrid.select_row = self self.part.datagrid.select_row = self
self.part.datagrid.dispatch('on_selected',self) self.part.datagrid.dispatch('on_selected',self)
class Header(WidgetReady, ScrollWidget): class Header(WidgetReady, ScrollPanel):
def __init__(self,part,**kw): def __init__(self,part,**kw):
super(Header, self).__init__(**kw) super(Header, self).__init__(**kw)
self.part = part self.part = part
@ -173,7 +173,7 @@ class Header(WidgetReady, ScrollWidget):
self.add_widget(self.header) self.add_widget(self.header)
self.height = self.header.height self.height = self.header.height
class Body(WidgetReady, ScrollWidget): class Body(WidgetReady, ScrollPanel):
def __init__(self,part,**kw): def __init__(self,part,**kw):
self.part = part self.part = part
kw.update({'spacing':self.part.datagrid.linewidth}) kw.update({'spacing':self.part.datagrid.linewidth})

View File

@ -32,10 +32,12 @@ from .custom_camera import CustomCamera, QrReader
if kivy.platform in ['win','linux', 'macosx']: if kivy.platform in ['win','linux', 'macosx']:
from .camerawithmic import ScreenWithMic from .camerawithmic import ScreenWithMic
from .camerawithmic import CameraWithMic from .camerawithmic import CameraWithMic
from .scrollpanel import ScrollPanel
r = Factory.register r = Factory.register
if kivy.platform in ['win','linux', 'macosx']: if kivy.platform in ['win','linux', 'macosx']:
r('ScreenWithMic', ScreenWithMic) r('ScreenWithMic', ScreenWithMic)
r('ScrollPanel', ScrollPanel)
r('TextInput', TextInput) r('TextInput', TextInput)
r('CameraWithMic', CameraWithMic) r('CameraWithMic', CameraWithMic)
r('CustomCamera', CustomCamera) r('CustomCamera', CustomCamera)