MirrorDimension/ocelot-desktop
1
0
Fork 0
mirror of https://gitlab.com/cc-ru/ocelot/ocelot-desktop.git synced 2026-01-06 19:22:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix style issues I happened to come across

Browse Source
This commit is contained in:
Fingercomp 2023-06-05 10:11:31 +07:00
parent dbb55900f3
commit a65c683529
No known key found for this signature in database
GPG Key ID: BBC71CEE45D86E37
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/ocelot/desktop/ui/UiHandler.scala
View File

@ -81,9 +81,9 @@ object UiHandler extends Logging {
_clipboard.setContents(data, data)
}
def isFullScreen: Boolean = Display.isFullscreen
def fullScreen: Boolean = Display.isFullscreen
def isFullScreen_=(value: Boolean): Any = {
def fullScreen_=(value: Boolean): Unit = {
if (value) {
Display.setDisplayModeAndFullscreen(Display.getDesktopDisplayMode)
}
@ -140,7 +140,7 @@ object UiHandler extends Logging {
loadLibraries()
scalingFactor = Settings.get.scaleFactor
isFullScreen = Settings.get.windowFullscreen
fullScreen = Settings.get.windowFullscreen
windowTitle = "Ocelot Desktop v" + BuildInfo.version
loadIcons()
@ -344,7 +344,7 @@ object UiHandler extends Logging {
}
// Settings fields should be updated only in non-fullscreen mode
if (isFullScreen)
if (fullScreen)
return
Settings.get.windowSize.set(width, height)

2
src/main/scala/ocelot/desktop/ui/widget/RootWidget.scala
View File

@ -60,7 +60,7 @@ class RootWidget(setupDefaultWorkspace: Boolean = true) extends Widget {
}
case KeyEvent(KeyEvent.State.Release, Keyboard.KEY_F11, _) =>
UiHandler.isFullScreen = !UiHandler.isFullScreen
UiHandler.fullScreen = !UiHandler.fullScreen
}
override def draw(g: Graphics): Unit = {

9
src/main/scala/ocelot/desktop/ui/widget/settings/UISettingsTab.scala
View File

@ -10,10 +10,13 @@ class UISettingsTab extends SettingsTab {
override val label: String = "UI"
override def applySettings(): Unit = {
if (UiHandler.isFullScreen != Settings.get.windowFullscreen)
UiHandler.isFullScreen = Settings.get.windowFullscreen
if (UiHandler.scalingFactor != Settings.get.scaleFactor)
if (UiHandler.fullScreen != Settings.get.windowFullscreen) {
UiHandler.fullScreen = Settings.get.windowFullscreen
}
if (UiHandler.scalingFactor != Settings.get.scaleFactor) {
UiHandler.scalingFactor = Settings.get.scaleFactor
}
}
children :+= new PaddingBox(new Checkbox("Move workspace windows together with workspace",