Compare commits

..

1 commit

Author SHA1 Message Date
downthecrop
7594e98f51 Merge branch 'KondoKit-2.0' into 'master'
KondoKit 2.0

See merge request 2009scape/rt4-client!28
2024-10-28 23:43:44 +00:00

View file

@ -308,17 +308,23 @@ class plugin : Plugin() {
return true
}
private fun initAltCanvas(){
if (frame != null) {
altCanvas = AltCanvas().apply {
preferredSize = Dimension(FIXED_WIDTH, FIXED_HEIGHT)
}
altCanvas?.let { frame.add(it) }
moveAltCanvasToFront()
frame.setComponentZOrder(rightPanelWrapper, 2)
}
updateDisplaySettings()
}
private fun updateDisplaySettings() {
val mode = GetWindowMode()
val currentScrollPaneWidth = if (mainContentPanel.isVisible) NAVBAR_WIDTH + MAIN_CONTENT_WIDTH else NAVBAR_WIDTH
lastUIOffset = uiOffset
if(mode != WindowMode.FIXED) {
destroyAltCanvas()
} else if (useScaledFixed && altCanvas == null) {
initAltCanvas()
}
when (mode) {
WindowMode.FIXED -> {
if (frame.width < FIXED_WIDTH + currentScrollPaneWidth + uiOffset) {
@ -367,43 +373,22 @@ class plugin : Plugin() {
StoreData("kondoLaunchMinimized", launchMinimized)
StoreData("kondoUIOffset", uiOffset)
StoreData("kondoScaledFixed", useScaledFixed)
if(lastUIOffset != uiOffset){
reloadInterfaces = true
if(altCanvas == null && useScaledFixed){
initAltCanvas()
} else if(altCanvas != null && !useScaledFixed){
destroyAltCanvas()
}
updateDisplaySettings()
}
private fun initAltCanvas(){
if(GetWindowMode() != WindowMode.FIXED || altCanvas != null) return
if (frame != null) {
altCanvas = AltCanvas().apply {
preferredSize = Dimension(FIXED_WIDTH, FIXED_HEIGHT)
}
altCanvas?.let { frame.add(it) }
moveAltCanvasToFront()
frame.setComponentZOrder(rightPanelWrapper, 2)
if(lastUIOffset != uiOffset){
updateDisplaySettings()
reloadInterfaces = true
}
}
private fun destroyAltCanvas(){
if (altCanvas == null) return
moveCanvasToFront()
frame.remove(altCanvas)
altCanvas = null
}
private fun moveAltCanvasToFront(){
if (altCanvas == null) return
frame.setComponentZOrder(canvas, 2)
frame.setComponentZOrder(altCanvas, 1)
frame.setComponentZOrder(rightPanelWrapper, 0)
}
private fun moveCanvasToFront(){
if (altCanvas == null) return
frame.setComponentZOrder(altCanvas, 2)
frame.setComponentZOrder(canvas, 1)
frame.setComponentZOrder(rightPanelWrapper, 0)
updateDisplaySettings()
}
private fun searchHiscore(username: String): Runnable {
@ -417,6 +402,20 @@ class plugin : Plugin() {
}
}
private fun moveAltCanvasToFront(){
if(altCanvas == null) return
frame.setComponentZOrder(canvas, 2)
frame.setComponentZOrder(altCanvas, 1)
frame.setComponentZOrder(rightPanelWrapper, 0)
}
private fun moveCanvasToFront(){
if(altCanvas == null) return
frame.setComponentZOrder(altCanvas, 2)
frame.setComponentZOrder(canvas, 1)
frame.setComponentZOrder(rightPanelWrapper, 0)
}
private fun restoreSettings(){
themeName = (GetData("kondoTheme") as? String) ?: "RUNELITE"
useLiveGEPrices = (GetData("kondoUseRemoteGE") as? Boolean) ?: true
@ -491,6 +490,9 @@ class plugin : Plugin() {
} else {
setActiveView(XPTrackerView.VIEW_NAME)
}
if(useScaledFixed) {
initAltCanvas()
}
initialized = true
pluginsReloaded = true
}