goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix remembering of main window size

pull/53/head
Zlatin Balevsky 2020-10-11 14:11:44 +01:00
parent f0696a1031
commit 346668dd6d
No known key found for this signature in database
GPG Key ID: A72832072D525E41
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
View File

@ -96,8 +96,18 @@ class MainFrameView {
String revision = "" String revision = ""
if (metadata["build.revision"] != null) if (metadata["build.revision"] != null)
revision = " revision " + metadata["build.revision"].substring(0,10) revision = " revision " + metadata["build.revision"].substring(0,10)
int mainFrameX = 1
int mainFrameY = 1
boolean pack = true
if (settings.mainFrameX > 0 && settings.mainFrameY > 0) {
pack = false
mainFrameX = settings.mainFrameX
mainFrameY = settings.mainFrameY
}
builder.with { builder.with {
application(size : [settings.mainFrameX,settings.mainFrameY], id: 'main-frame', application(size : [mainFrameX,mainFrameY], id: 'main-frame',
locationRelativeTo : null, locationRelativeTo : null,
defaultCloseOperation : JFrame.DO_NOTHING_ON_CLOSE, defaultCloseOperation : JFrame.DO_NOTHING_ON_CLOSE,
title: application.configuration['application.title'] + " " + title: application.configuration['application.title'] + " " +
@ -106,7 +116,7 @@ class MainFrameView {
iconImages: [imageIcon('/MuWire-48x48.png').image, iconImages: [imageIcon('/MuWire-48x48.png').image,
imageIcon('/MuWire-32x32.png').image, imageIcon('/MuWire-32x32.png').image,
imageIcon('/MuWire-16x16.png').image], imageIcon('/MuWire-16x16.png').image],
pack : true, pack : pack,
visible : bind { model.coreInitialized }) { visible : bind { model.coreInitialized }) {
menuBar { menuBar {
menu (text : trans("FILE")) { menu (text : trans("FILE")) {

4
gui/src/main/groovy/com/muwire/gui/UISettings.groovy
View File

@ -47,8 +47,8 @@ class UISettings {
groupByFile = Boolean.parseBoolean(props.getProperty("groupByFile","false")) groupByFile = Boolean.parseBoolean(props.getProperty("groupByFile","false"))
maxChatLines = Integer.parseInt(props.getProperty("maxChatLines","-1")) maxChatLines = Integer.parseInt(props.getProperty("maxChatLines","-1"))
mainFrameX = Integer.parseInt(props.getProperty("mainFrameX","1024")) mainFrameX = Integer.parseInt(props.getProperty("mainFrameX","-1"))
mainFrameY = Integer.parseInt(props.getProperty("mainFrameY","768")) mainFrameY = Integer.parseInt(props.getProperty("mainFrameY","-1"))
searchHistory = DataUtil.readEncodedSet(props, "searchHistory") searchHistory = DataUtil.readEncodedSet(props, "searchHistory")
openTabs = DataUtil.readEncodedSet(props, "openTabs") openTabs = DataUtil.readEncodedSet(props, "openTabs")