diff --git a/CHANGELOG.md b/CHANGELOG.md index d762276b..5a0fd211 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,6 @@ ## Unversioned -- Bugfix: Disable "Sort Tabs Alphabetically" action when notebook layout is locked. (#6704) - Minor: Add a separate highlight option for watchstreak notifications. (#6571, #6581) - Minor: Badges now link to their home page like emotes in the context menu. (#6437) - Minor: Fixed usercard resizing improperly without recent messages. (#6496) @@ -43,6 +42,7 @@ - Bugfix: Added `desktop-entry` hint to Linux notifications. (#6615) - Bugfix: Fixed CMD + DELETE behavior in the user notes editing dialog for macOS. (#6676) - Bugfix: Fixed a potential crash when closing Chatterino with a slow network connection. (#6645) +- Bugfix: Disable "Sort Tabs Alphabetically" action when notebook layout is locked. (#6710) - Dev: Update release documentation. (#6498) - Dev: Make code sanitizers opt in with the `CHATTERINO_SANITIZER_SUPPORT` CMake option. After that's enabled, use the `SANITIZE_*` flag to enable individual sanitizers. (#6493) - Dev: Remove unused QTextCodec includes. (#6487) diff --git a/src/widgets/Notebook.cpp b/src/widgets/Notebook.cpp index 59607d7c..f33084db 100644 --- a/src/widgets/Notebook.cpp +++ b/src/widgets/Notebook.cpp @@ -1640,7 +1640,7 @@ void SplitNotebook::forEachSplit(const std::function &cb) void SplitNotebook::setLockNotebookLayout(bool value) { - this->Notebook::setLockNotebookLayout(value); + Notebook::setLockNotebookLayout(value); this->sortTabsAlphabeticallyAction_->setEnabled(!value); } diff --git a/src/widgets/Notebook.hpp b/src/widgets/Notebook.hpp index decba290..8f020641 100644 --- a/src/widgets/Notebook.hpp +++ b/src/widgets/Notebook.hpp @@ -122,8 +122,6 @@ public: // Update layout and tab visibility void refresh(); - void sortTabsAlphabetically(); - protected: bool getShowTabs() const; void setShowTabs(bool value); @@ -171,6 +169,8 @@ protected: void performLayout(bool animate = false); + void sortTabsAlphabetically(); + private: struct LayoutContext { int left = 0;