diff --git a/PersonImage/1.txt b/PersonImage/1.txt new file mode 100644 index 0000000..e69de29 diff --git a/PersonImage/新建 文本文档 (2).txt b/PersonImage/新建 文本文档 (2).txt new file mode 100644 index 0000000..e567fdd --- /dev/null +++ b/PersonImage/新建 文本文档 (2).txt @@ -0,0 +1,3 @@ + +Path = +"C:/Users/q/AppData/Local/GeminiBrowser/GeminiBrowser.exe" diff --git a/main.go b/main.go index fb0cbf3..4c45ec3 100644 --- a/main.go +++ b/main.go @@ -295,6 +295,18 @@ func initsocket() { } } +type customTheme struct { + fyne.Theme + textSize float32 +} + +func (t *customTheme) Size(name fyne.ThemeSizeName) float32 { + if name == theme.SizeNameText { + return t.textSize + } + return t.Theme.Size(name) +} + // 主窗体加载 func MainWindowControl() { @@ -307,7 +319,12 @@ func MainWindowControl() { CFLXCfig = Common.LoadConfig() BigPara = CFLXCfig.CheckInDoor.BigPara NAPP = app.NewWithID("FlxCongress") - fyne.CurrentApp().Settings().SetTheme(theme.LightTheme()) + // fyne.CurrentApp().Settings().SetTheme(theme.LightTheme()) + myTheme := &customTheme{ + Theme: theme.LightTheme(), // 基于亮色主题扩展 + textSize: 20 * BigPara, // 设置全局字体大小(单位:像素) + } + fyne.CurrentApp().Settings().SetTheme(myTheme) // 生效自定义主题 iconResource, _ := fyne.LoadResourceFromPath("icon.ico") MainWindow = NAPP.NewWindow("飞利信报道门系统") MainWindow.SetIcon(iconResource) @@ -629,6 +646,7 @@ func DefaultLayout() fyne.CanvasObject { // lblTime.Resize(fyne.NewSize(300, 50)) // lblTime.Move(fyne.NewPos(150, 1000)) // ShowTime1(lblt) + //同步照片 btnMergeImage := widget.NewButton("同步照片", func() { //同步照片 @@ -645,6 +663,7 @@ func DefaultLayout() fyne.CanvasObject { time.Sleep(time.Second * 2) w.Close() }() + }) btnMergeImage.Resize(fyne.NewSize(200*BigPara, 50*BigPara)) diff --git a/mister/screen/web/meetingview.html b/mister/screen/web/meetingview.html index 8c0e0ef..3491939 100644 --- a/mister/screen/web/meetingview.html +++ b/mister/screen/web/meetingview.html @@ -9,14 +9,12 @@