mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-02 09:39:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fix left/right nav from content to change tabs

Browse Source
This commit is contained in:
Luke Street
2026-05-04 11:17:48 -06:00
parent 7ba22b7714
commit 010bdb7e25
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dusk/ui/tab_bar.cpp
+14 -12
View File
@@ -44,14 +44,15 @@ TabBar::TabBar(Rml::Element* parent, Props props)
: FluentComponent(createRoot(parent)), mProps(std::move(props)) {
if (mProps.onClose) {
mRoot->SetAttribute("closable", "");
add_child<Button>(Button::Props{}, "close").on_nav_command([this](Rml::Event&, NavCommand cmd) {
if (cmd == NavCommand::Confirm) {
mDoAud_seStartMenu(Z2SE_SY_CURSOR_CANCEL);
mProps.onClose();
return true;
}
return false;
});
add_child<Button>(Button::Props{}, "close")
.on_nav_command([this](Rml::Event&, NavCommand cmd) {
if (cmd == NavCommand::Confirm) {
mDoAud_seStartMenu(Z2SE_SY_CURSOR_CANCEL);
mProps.onClose();
return true;
}
return false;
});
mEndSpacer = append(mRoot, "tab-end-spacer");
}
@@ -167,9 +168,7 @@ bool TabBar::set_active_tab(int index) {
}
void TabBar::refresh_active_tab() {
if (mProps.selectedTabIndex >= 0 &&
mProps.selectedTabIndex < static_cast<int>(mTabs.size()))
{
if (mProps.selectedTabIndex >= 0 && mProps.selectedTabIndex < static_cast<int>(mTabs.size())) {
const auto& tab = mTabs[mProps.selectedTabIndex];
if (tab.callback) {
tab.callback();
@@ -208,7 +207,10 @@ bool TabBar::handle_nav_command(Rml::Event& event, NavCommand cmd) {
bool isNext = cmd == NavCommand::Right || cmd == NavCommand::Next;
int currentComponent = mProps.selectedTabIndex;
if (cmd == NavCommand::Left || cmd == NavCommand::Right) {
currentComponent = tab_containing(event.GetTargetElement());
int activeTab = tab_containing(event.GetTargetElement());
if (activeTab != -1) {
currentComponent = activeTab;
}
}
int direction = isNext ? 1 : -1;
if (currentComponent == -1) {