2009Scape/rt4-client
1
0
Fork 0
mirror of https://gitlab.com/2009scape/rt4-client.git synced 2025-12-09 16:45:46 -07:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'KondoKit-2.0' into 'FIXED-RESIZE'

Browse source 
# Conflicts:
#   plugin-playground/src/main/kotlin/KondoKit/ScrollablePanel.kt
This commit is contained in:
downthecrop 2024-10-28 23:41:42 +00:00
commit 4ebba194dc
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugin-playground/src/main/kotlin/KondoKit/ScrollablePanel.kt
View file

@ -18,6 +18,7 @@ class ScrollablePanel(private val content: JPanel) : JPanel() {
private var scrollbarY = 0 private var scrollbarY = 0
private var showScrollbar = false private var showScrollbar = false
private var draggingScrollPill = false private var draggingScrollPill = false
private var lastSize = 0
// Define a buffer for the view height (extra space for smoother scrolling) // Define a buffer for the view height (extra space for smoother scrolling)
private val viewBuffer = -30 private val viewBuffer = -30
@ -69,6 +70,8 @@ class ScrollablePanel(private val content: JPanel) : JPanel() {
Timer().schedule(object : TimerTask() { Timer().schedule(object : TimerTask() {
override fun run() { override fun run() {
updateScrollbar() updateScrollbar()
if(lastSize != content.preferredSize.height.coerceAtLeast(frame.height + viewBuffer))
handleResize()
} }
}, 0, 1000) }, 0, 1000)
@ -85,9 +88,10 @@ class ScrollablePanel(private val content: JPanel) : JPanel() {
// Ensure the ScrollablePanel resizes with the frame // Ensure the ScrollablePanel resizes with the frame
bounds = Rectangle(0, 0, 242, frame.height) bounds = Rectangle(0, 0, 242, frame.height)
// Dynamically update content bounds and scrollbar on frame resize with buffer // Dynamically update content bounds and scrollbar on frame resize with buffer
content.bounds = Rectangle(0, 0, 242, content.preferredSize.height.coerceAtLeast(frame.height + viewBuffer)) lastSize = content.preferredSize.height.coerceAtLeast(frame.height + viewBuffer)
showScrollbar = content.height > frame.height content.bounds = Rectangle(0, 0, 242, lastSize)
showScrollbar = content.height > frame.height
currentOffsetY = 0 currentOffsetY = 0

2
plugin-playground/src/main/kotlin/KondoKit/Themes.kt
View file

@ -60,7 +60,7 @@ object Themes {
ThemeType.SARADOMIN -> Theme( ThemeType.SARADOMIN -> Theme(
widgetColor = Color(62, 53, 41), widgetColor = Color(62, 53, 41),
titleBarColor = Color(111, 93, 69).darker(), titleBarColor = Color(111, 93, 69).darker(),
viewBackgroundColor = Color(111, 93, 69), viewBackgroundColor = Color(101, 85, 63),
primaryColor = Color(180, 150, 120), primaryColor = Color(180, 150, 120),
secondaryColor = Color(230, 210, 190), secondaryColor = Color(230, 210, 190),
popupBackground = Color(70, 56, 42), popupBackground = Color(70, 56, 42),