From a017170c712dd7e60958b6d968ab59cdd33780c1 Mon Sep 17 00:00:00 2001 From: messypy Date: Tue, 28 Jul 2026 00:20:57 +0900 Subject: [PATCH] Align settings controls --- cmd/vrc_osc_gui/window_windows.go | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/cmd/vrc_osc_gui/window_windows.go b/cmd/vrc_osc_gui/window_windows.go index 005d0be..6f96b37 100644 --- a/cmd/vrc_osc_gui/window_windows.go +++ b/cmd/vrc_osc_gui/window_windows.go @@ -1867,16 +1867,17 @@ func paintSettingsPane(hwnd uintptr, app *guiApp) uintptr { drawPaneText(hdc, 24, 68, "表示", app.hFont, clrMutedText) drawSettingsWideButton(hdc, settingsTopMostRect(), "Top most", onOffBool(app.topMost), app.hFont, app.topMost) drawSettingsWideButton(hdc, settingsAutoUnmuteRect(), "Leave unmute", onOffBool(app.autoUnmuteOnLeave), app.hFont, app.autoUnmuteOnLeave) - drawPaneText(hdc, 24, 190, "文字サイズ", app.hFont, clrMutedText) + drawPaneText(hdc, 24, 190, "更新間隔", app.hFont, clrMutedText) drawSettingsRefreshControl(hdc, app) + drawPaneText(hdc, 24, 314, "文字サイズ", app.hFont, clrMutedText) drawSettingsFontControl(hdc, app) - drawPaneText(hdc, 24, 374, "履歴 Export", app.hFont, clrMutedText) - drawPaneText(hdc, 24, 396, "出力先フォルダ", app.hFont, clrMutedText) + drawPaneText(hdc, 24, 390, "履歴 Export", app.hFont, clrMutedText) + drawPaneText(hdc, 24, 412, "出力先フォルダ", app.hFont, clrMutedText) drawSettingsWideButton(hdc, settingsHistoryExportTimeRect(), "Time", onOffBool(app.historyExportIncludeTime), app.hFont, app.historyExportIncludeTime) drawSettingsWideButton(hdc, settingsHistoryExportWorldRect(), "World", onOffBool(app.historyExportIncludeWorld), app.hFont, app.historyExportIncludeWorld) drawSettingsWideButton(hdc, settingsHistoryExportJoinLeaveRect(), "Join/Leave", onOffBool(app.historyExportIncludeJoinLeave), app.hFont, app.historyExportIncludeJoinLeave) drawSettingsWideButton(hdc, settingsHistoryExportCustomToggleRect(), "Custom", onOffBool(app.historyExportCustomEnabled), app.hFont, app.historyExportCustomEnabled) - drawPaneText(hdc, 24, 516, "Custom 条件", app.hFont, clrMutedText) + drawPaneText(hdc, 24, 532, "Custom 条件", app.hFont, clrMutedText) return 0 } @@ -1917,35 +1918,35 @@ func settingsFontUpRect() winRect { } func settingsHistoryExportDirRect() winRect { - return winRect{Left: 116, Top: 420, Right: 636, Bottom: 444} + return winRect{Left: 24, Top: 436, Right: 636, Bottom: 460} } func settingsHistoryExportBrowseRect() winRect { - return winRect{Left: 644, Top: 420, Right: 736, Bottom: 444} + return winRect{Left: 644, Top: 436, Right: 736, Bottom: 460} } func settingsHistoryExportTimeRect() winRect { - return winRect{Left: 24, Top: 452, Right: 360, Bottom: 482} + return winRect{Left: 24, Top: 468, Right: 360, Bottom: 498} } func settingsHistoryExportWorldRect() winRect { - return winRect{Left: 376, Top: 452, Right: 736, Bottom: 482} + return winRect{Left: 376, Top: 468, Right: 736, Bottom: 498} } func settingsHistoryExportJoinLeaveRect() winRect { - return winRect{Left: 24, Top: 488, Right: 360, Bottom: 518} + return winRect{Left: 24, Top: 504, Right: 360, Bottom: 534} } func settingsHistoryExportCustomToggleRect() winRect { - return winRect{Left: 376, Top: 488, Right: 736, Bottom: 518} + return winRect{Left: 376, Top: 504, Right: 736, Bottom: 534} } func settingsHistoryExportCustomRect() winRect { - return winRect{Left: 116, Top: 536, Right: 636, Bottom: 558} + return winRect{Left: 24, Top: 552, Right: 636, Bottom: 574} } func settingsHistoryExportCustomSaveRect() winRect { - return winRect{Left: 644, Top: 536, Right: 736, Bottom: 558} + return winRect{Left: 644, Top: 552, Right: 736, Bottom: 574} } func handleSettingsPaneClick(app *guiApp, x, y int32, getWindowText, setWindowText *syscall.LazyProc) bool { @@ -2035,9 +2036,9 @@ func drawSettingsRefreshControl(hdc uintptr, app *guiApp) { drawSettingsBox(hdc, settingsRefreshValueRect(), uint32(0x0038281a), border) drawSettingsBox(hdc, settingsRefreshUpRect(), fill, border) drawSettingsWideButton(hdc, settingsRefreshUnitRect(), "\u5358\u4f4d", refreshIntervalUnitLabel(app.refreshIntervalUnit), font, true) - drawCenteredPaneText(hdc, settingsRefreshDownRect(), "A-", font, clrText) + drawCenteredPaneText(hdc, settingsRefreshDownRect(), "-", font, clrText) drawCenteredPaneText(hdc, settingsRefreshValueRect(), refreshIntervalValueLabel(app.refreshIntervalValue, app.refreshIntervalUnit), font, clrMutedText) - drawCenteredPaneText(hdc, settingsRefreshUpRect(), "A+", font, clrText) + drawCenteredPaneText(hdc, settingsRefreshUpRect(), "+", font, clrText) } func refreshIntervalValueLabel(value int, unit string) string { @@ -2662,7 +2663,7 @@ func drawSettingsFontControl(hdc uintptr, app *guiApp) { drawSettingsBox(hdc, settingsFontValueRect(), uint32(0x0038281a), border) drawSettingsBox(hdc, settingsFontUpRect(), fill, border) drawCenteredPaneText(hdc, settingsFontDownRect(), "A-", font, clrText) - drawCenteredPaneText(hdc, settingsFontValueRect(), strconv.Itoa(app.fontSize), font, clrMutedText) + drawCenteredPaneText(hdc, settingsFontValueRect(), strconv.Itoa(app.fontSize)+" pt", font, clrMutedText) drawCenteredPaneText(hdc, settingsFontUpRect(), "A+", font, clrText) }