Skip to content

Commit afac12a

Browse files
committed
regression: scroll mode disabled if paging button hidden since 5d5f7d5
1 parent 5d71600 commit afac12a

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
lint:
1414
runs-on: macos-26
1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v6
1717
with:
1818
submodules: true # needs fcitx5/.clang-format
1919

@@ -36,11 +36,11 @@ jobs:
3636
- { arch: x86_64, type: Debug, postfix: -debug }
3737

3838
steps:
39-
- uses: actions/checkout@v5
39+
- uses: actions/checkout@v6
4040
with:
4141
submodules: recursive
4242

43-
- uses: actions/setup-node@v5
43+
- uses: actions/setup-node@v6
4444
with:
4545
node-version: 24.x
4646

webpanel/webpanel.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -426,10 +426,9 @@ void WebPanel::update(UserInterfaceComponent component,
426426
}
427427
// Paging
428428
auto *pageableList = list->toPageable();
429-
pageable =
430-
pageableList && *config_.typography->pagingButtonsStyle !=
431-
PagingButtonsStyle::None;
432-
if (pageable) {
429+
if (pageableList) {
430+
pageable = *config_.typography->pagingButtonsStyle !=
431+
PagingButtonsStyle::None;
433432
hasPrev = pageableList->hasPrev();
434433
hasNext = pageableList->hasNext();
435434
}
@@ -448,7 +447,7 @@ void WebPanel::update(UserInterfaceComponent component,
448447
return expand();
449448
}
450449
// Disable scroll mode if all candidates are on the same page.
451-
if (pageableList != nullptr && (hasPrev || hasNext)) {
450+
if (hasPrev || hasNext) {
452451
scrollState_ = candidate_window::scroll_state_t::ready;
453452
} else {
454453
pageable = false;

0 commit comments

Comments
 (0)