DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Improve blocker flashing

Browse Source
This commit is contained in:
DBotThePony 2023-07-18 01:54:21 +07:00
parent 0e9a480dd8
commit 25875b162e
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EditablePanel.kt
View File

@ -403,12 +403,10 @@ open class EditablePanel<out S : Screen> @JvmOverloads constructor(
var isFlashing: Boolean
get() {
if (flashingSince == null) {
return false
}
val flashingSince = flashingSince ?: return false
if (flashingSince!!.millis >= 1200L) {
flashingSince = null
if (flashingSince.millis >= 1200L) {
this.flashingSince = null
return false
}
@ -416,8 +414,14 @@ open class EditablePanel<out S : Screen> @JvmOverloads constructor(
}
set(value) {
if (value) {
if (screen is MatteryScreen<*>) {
screen.popup(findAbsoluteRoot() as EditablePanel<MatteryScreen<*>>)
}
if (!flashAnyBlocker(true)) {
flashingSince = SystemTime()
popup()
findAbsoluteRoot().requestFocus()
}
} else {
flashingSince = null
}
@ -466,23 +470,7 @@ open class EditablePanel<out S : Screen> @JvmOverloads constructor(
}
protected fun flashAnyBlocker(doFlash: Boolean = true): Boolean {
var blockingWindow = blockingWindow
var parent = parent
while (blockingWindow == null && parent != null) {
blockingWindow = parent.blockingWindow
parent = parent.parent
}
if (blockingWindow == null) {
return flashAnyBlockerInner(doFlash)
}
if (doFlash) {
blockingWindow.isFlashing = true
}
return true
return findAbsoluteRoot().flashAnyBlockerInner(doFlash)
}
@JvmOverloads
@ -1732,17 +1720,17 @@ open class EditablePanel<out S : Screen> @JvmOverloads constructor(
isRemoved = true
}
fun popup(focus: Boolean = true) {
fun popup(focus: Boolean = true, doFlash: Boolean = true) {
if (isRemoved) {
return
}
if (screen is MatteryScreen<*> && parent == null) {
screen.popup(this as EditablePanel<MatteryScreen<*>>)
if (screen is MatteryScreen<*>) {
screen.popup(findAbsoluteRoot() as EditablePanel<MatteryScreen<*>>)
}
if (focus) {
requestFocus()
if (focus && !flashAnyBlocker(doFlash)) {
findAbsoluteRoot().requestFocus()
}
}