Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'do-not-move-hot-buffers' into v1.10-dev
Browse files Browse the repository at this point in the history
oakkitten committed Dec 25, 2024
2 parents 6a3457c + a5ae9be commit 5d775e9
Showing 24 changed files with 543 additions and 98 deletions.
131 changes: 131 additions & 0 deletions app/src/main/inkscape/ic_bufferlist_arrow_down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
133 changes: 133 additions & 0 deletions app/src/main/inkscape/ic_bufferlist_arrow_up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/src/main/inkscape/optimized/ic_bufferlist_arrow_down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/src/main/inkscape/optimized/ic_bufferlist_arrow_up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -269,7 +269,6 @@ class WeechatActivity : AppCompatActivity(), CutePageChangeListener,
Network.get().register(this, null) // no callback, simply make sure that network info is correct while we are showing
EventBus.getDefault().register(this)
connectionState = EventBus.getDefault().getStickyEvent(StateChangedEvent::class.java).state
updateHotCount(BufferList.totalHotMessageCount)
started = true
P.storeThemeOrColorSchemeColors(this)
applyColorSchemeToViews()
@@ -500,6 +499,7 @@ class WeechatActivity : AppCompatActivity(), CutePageChangeListener,
uiMenu = menu
updateMenuItems()
makeMenuReflectConnectionStatus()
// `onCreateOptionsMenu` is called *after* onStart, when `updateHotCount` was already called
updateHotCount(hotNumber)
return super.onCreateOptionsMenu(menu)
}
@@ -669,6 +669,8 @@ class WeechatActivity : AppCompatActivity(), CutePageChangeListener,
}
}

fun isBufferListVisible() = !slidy || isPagerNoticeablyObscured

// set the kitty image that appears when no pages are open
private var kittyImageResourceId = -1
@MainThread @Cat private fun setKittyImage(resourceId: Int) {
Loading

0 comments on commit 5d775e9

Please sign in to comment.