From 67aaca22e2c2120867d290b3f7cfa3b2bcc45997 Mon Sep 17 00:00:00 2001 From: James Upjohn Date: Wed, 24 Mar 2021 19:37:15 +1300 Subject: [PATCH 1/3] Replace QSet with QList --- src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp b/src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp index f5b2dc743c6..9a8fe08ca3e 100644 --- a/src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp +++ b/src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp @@ -14,14 +14,14 @@ namespace chatterino { namespace { - QSet openPages() + QList openPages() { - QSet pages; + QList pages; auto &nb = getApp()->windows->getMainWindow().getNotebook(); for (int i = 0; i < nb.getPageCount(); ++i) { - pages.insert(static_cast(nb.getPageAt(i))); + pages.append(static_cast(nb.getPageAt(i))); } return pages; From be9f1163925726239b0fcd032fc844aaf9227c23 Mon Sep 17 00:00:00 2001 From: James Upjohn Date: Wed, 24 Mar 2021 19:44:59 +1300 Subject: [PATCH 2/3] Append bugfix to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05b2312b14f..2c99e425ea5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -84,6 +84,7 @@ - Bugfix: Fix Twitch cheer emotes not displaying tooltips when hovered (#2434, #2503) - Bugfix: Fix BTTV/FFZ channel emotes saying unknown error when no emotes found (#2542) - Bugfix: Fix directory not opening when clicking "Open AppData Directory" setting button on macOS (#2531, #2537) +- Bugfix: Fix quickswitcher not respecting order of tabs when filtering (#2519, #TODO) - Dev: Updated minimum required Qt framework version to 5.12. (#2210) - Dev: Migrated `Kraken::getUser` to Helix (#2260) - Dev: Migrated `TwitchAccount::(un)followUser` from Kraken to Helix and moved it to `Helix::(un)followUser`. (#2306) From e092d6067827fbbec5ef59ead916bd39e1209d10 Mon Sep 17 00:00:00 2001 From: James Upjohn Date: Wed, 24 Mar 2021 19:50:35 +1300 Subject: [PATCH 3/3] Add PR ID to changelog entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c99e425ea5..d9f83d306e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -84,7 +84,7 @@ - Bugfix: Fix Twitch cheer emotes not displaying tooltips when hovered (#2434, #2503) - Bugfix: Fix BTTV/FFZ channel emotes saying unknown error when no emotes found (#2542) - Bugfix: Fix directory not opening when clicking "Open AppData Directory" setting button on macOS (#2531, #2537) -- Bugfix: Fix quickswitcher not respecting order of tabs when filtering (#2519, #TODO) +- Bugfix: Fix quickswitcher not respecting order of tabs when filtering (#2519, #2561) - Dev: Updated minimum required Qt framework version to 5.12. (#2210) - Dev: Migrated `Kraken::getUser` to Helix (#2260) - Dev: Migrated `TwitchAccount::(un)followUser` from Kraken to Helix and moved it to `Helix::(un)followUser`. (#2306)