Give settings export controls more space
All checks were successful
build-windows-exe / build (push) Successful in 1m46s
All checks were successful
build-windows-exe / build (push) Successful in 1m46s
This commit is contained in:
@@ -102,7 +102,7 @@ const (
|
|||||||
leftPaneHeight = 560
|
leftPaneHeight = 560
|
||||||
rightPaneWidth = windowWidth - leftPaneWidth
|
rightPaneWidth = windowWidth - leftPaneWidth
|
||||||
settingsPaneWidth = rightPaneWidth
|
settingsPaneWidth = rightPaneWidth
|
||||||
settingsPaneHeight = leftPaneHeight
|
settingsPaneHeight = 700
|
||||||
clrMainBg = 0x00311c0b
|
clrMainBg = 0x00311c0b
|
||||||
clrHeaderBg = 0x004d2c08
|
clrHeaderBg = 0x004d2c08
|
||||||
clrNavBg = 0x0024150b
|
clrNavBg = 0x0024150b
|
||||||
@@ -1633,10 +1633,10 @@ func resizeGUIForSettings(app *guiApp) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
resizeFlags := hwndNoMove | hwndNoZOrder | hwndNoActivate
|
resizeFlags := hwndNoMove | hwndNoZOrder | hwndNoActivate
|
||||||
windowHeight := contentTop + leftPaneHeight + bottomBarHeight
|
windowHeight := contentTop + settingsPaneHeight + bottomBarHeight
|
||||||
setWindowPosProc.Call(app.hwnd, 0, 0, 0, windowWidth, uintptr(windowHeight), resizeFlags)
|
setWindowPosProc.Call(app.hwnd, 0, 0, 0, windowWidth, uintptr(windowHeight), resizeFlags)
|
||||||
if app.settingsPaneHwnd != 0 {
|
if app.settingsPaneHwnd != 0 {
|
||||||
setWindowPosProc.Call(app.settingsPaneHwnd, 0, 0, uintptr(contentTop), windowWidth, uintptr(leftPaneHeight), resizeFlags)
|
setWindowPosProc.Call(app.settingsPaneHwnd, 0, 0, uintptr(contentTop), windowWidth, uintptr(settingsPaneHeight), resizeFlags)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1871,13 +1871,13 @@ func paintSettingsPane(hwnd uintptr, app *guiApp) uintptr {
|
|||||||
drawSettingsRefreshControl(hdc, app)
|
drawSettingsRefreshControl(hdc, app)
|
||||||
drawPaneText(hdc, 24, 314, "文字サイズ", app.hFont, clrMutedText)
|
drawPaneText(hdc, 24, 314, "文字サイズ", app.hFont, clrMutedText)
|
||||||
drawSettingsFontControl(hdc, app)
|
drawSettingsFontControl(hdc, app)
|
||||||
drawPaneText(hdc, 24, 390, "履歴 Export", app.hFont, clrMutedText)
|
drawPaneText(hdc, 24, 400, "履歴 Export", app.hFont, clrMutedText)
|
||||||
drawPaneText(hdc, 24, 412, "出力先フォルダ", app.hFont, clrMutedText)
|
drawPaneText(hdc, 24, 430, "出力先フォルダ", app.hFont, clrMutedText)
|
||||||
drawSettingsWideButton(hdc, settingsHistoryExportTimeRect(), "Time", onOffBool(app.historyExportIncludeTime), app.hFont, app.historyExportIncludeTime)
|
drawSettingsWideButton(hdc, settingsHistoryExportTimeRect(), "Time", onOffBool(app.historyExportIncludeTime), app.hFont, app.historyExportIncludeTime)
|
||||||
drawSettingsWideButton(hdc, settingsHistoryExportWorldRect(), "World", onOffBool(app.historyExportIncludeWorld), app.hFont, app.historyExportIncludeWorld)
|
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, settingsHistoryExportJoinLeaveRect(), "Join/Leave", onOffBool(app.historyExportIncludeJoinLeave), app.hFont, app.historyExportIncludeJoinLeave)
|
||||||
drawSettingsWideButton(hdc, settingsHistoryExportCustomToggleRect(), "Custom", onOffBool(app.historyExportCustomEnabled), app.hFont, app.historyExportCustomEnabled)
|
drawSettingsWideButton(hdc, settingsHistoryExportCustomToggleRect(), "Custom", onOffBool(app.historyExportCustomEnabled), app.hFont, app.historyExportCustomEnabled)
|
||||||
drawPaneText(hdc, 24, 532, "Custom 条件", app.hFont, clrMutedText)
|
drawPaneText(hdc, 24, 618, "Custom 条件", app.hFont, clrMutedText)
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1918,35 +1918,35 @@ func settingsFontUpRect() winRect {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func settingsHistoryExportDirRect() winRect {
|
func settingsHistoryExportDirRect() winRect {
|
||||||
return winRect{Left: 24, Top: 436, Right: 636, Bottom: 460}
|
return winRect{Left: 24, Top: 458, Right: 636, Bottom: 490}
|
||||||
}
|
}
|
||||||
|
|
||||||
func settingsHistoryExportBrowseRect() winRect {
|
func settingsHistoryExportBrowseRect() winRect {
|
||||||
return winRect{Left: 644, Top: 436, Right: 736, Bottom: 460}
|
return winRect{Left: 644, Top: 458, Right: 736, Bottom: 490}
|
||||||
}
|
}
|
||||||
|
|
||||||
func settingsHistoryExportTimeRect() winRect {
|
func settingsHistoryExportTimeRect() winRect {
|
||||||
return winRect{Left: 24, Top: 468, Right: 360, Bottom: 498}
|
return winRect{Left: 24, Top: 510, Right: 360, Bottom: 546}
|
||||||
}
|
}
|
||||||
|
|
||||||
func settingsHistoryExportWorldRect() winRect {
|
func settingsHistoryExportWorldRect() winRect {
|
||||||
return winRect{Left: 376, Top: 468, Right: 736, Bottom: 498}
|
return winRect{Left: 376, Top: 510, Right: 736, Bottom: 546}
|
||||||
}
|
}
|
||||||
|
|
||||||
func settingsHistoryExportJoinLeaveRect() winRect {
|
func settingsHistoryExportJoinLeaveRect() winRect {
|
||||||
return winRect{Left: 24, Top: 504, Right: 360, Bottom: 534}
|
return winRect{Left: 24, Top: 558, Right: 360, Bottom: 594}
|
||||||
}
|
}
|
||||||
|
|
||||||
func settingsHistoryExportCustomToggleRect() winRect {
|
func settingsHistoryExportCustomToggleRect() winRect {
|
||||||
return winRect{Left: 376, Top: 504, Right: 736, Bottom: 534}
|
return winRect{Left: 376, Top: 558, Right: 736, Bottom: 594}
|
||||||
}
|
}
|
||||||
|
|
||||||
func settingsHistoryExportCustomRect() winRect {
|
func settingsHistoryExportCustomRect() winRect {
|
||||||
return winRect{Left: 24, Top: 552, Right: 636, Bottom: 574}
|
return winRect{Left: 24, Top: 646, Right: 636, Bottom: 678}
|
||||||
}
|
}
|
||||||
|
|
||||||
func settingsHistoryExportCustomSaveRect() winRect {
|
func settingsHistoryExportCustomSaveRect() winRect {
|
||||||
return winRect{Left: 644, Top: 552, Right: 736, Bottom: 574}
|
return winRect{Left: 644, Top: 646, Right: 736, Bottom: 678}
|
||||||
}
|
}
|
||||||
|
|
||||||
func handleSettingsPaneClick(app *guiApp, x, y int32, getWindowText, setWindowText *syscall.LazyProc) bool {
|
func handleSettingsPaneClick(app *guiApp, x, y int32, getWindowText, setWindowText *syscall.LazyProc) bool {
|
||||||
|
|||||||
Reference in New Issue
Block a user