From 787e27df2c41050df77696b8e943334201cefb6f Mon Sep 17 00:00:00 2001 From: tangjie02 Date: Tue, 15 Nov 2022 09:12:10 +0800 Subject: [PATCH] Fix that the category overlaps the search box after the start menu collapses the category list. Signed-off-by: tangjie02 --- ...t-the-category-overlaps-the-search-b.patch | 71 +++++++++++++++++++ kiran-menu.spec | 6 +- 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 0001-fix-menu-Fix-that-the-category-overlaps-the-search-b.patch diff --git a/0001-fix-menu-Fix-that-the-category-overlaps-the-search-b.patch b/0001-fix-menu-Fix-that-the-category-overlaps-the-search-b.patch new file mode 100644 index 0000000..f339c87 --- /dev/null +++ b/0001-fix-menu-Fix-that-the-category-overlaps-the-search-b.patch @@ -0,0 +1,71 @@ +From 9933ff89f98c176e7ce097500004ab3da860fb81 Mon Sep 17 00:00:00 2001 +From: tangjie02 +Date: Mon, 14 Nov 2022 20:46:18 +0800 +Subject: [PATCH] fix(menu): Fix that the category overlaps the search box + after the start menu collapses the category list. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 修复开始菜单收起类别列表后，分类与搜索框重叠 + +Closes #I60PSI + +Signed-off-by: tangjie02 +--- + src/menu/menu-applet-window.cpp | 5 ++++- + src/menu/menu-applet-window.h | 1 + + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/menu/menu-applet-window.cpp b/src/menu/menu-applet-window.cpp +index 7cc9750..81397a4 100644 +--- a/src/menu/menu-applet-window.cpp ++++ b/src/menu/menu-applet-window.cpp +@@ -216,6 +216,7 @@ void MenuAppletWindow::init_ui() + builder->get_widget("menu-sider-container", sider_box); + builder->get_widget("menu-view-stack-switcher", menu_view_stack_switcher); + builder->get_widget("menu-view-stack", menu_view_stack); ++ builder->get_widget("all-apps-view", all_app_view); + builder->get_widget("apps-list-stack", apps_list_stack); + + builder->get_widget("search-box", search_box); +@@ -492,7 +493,7 @@ void MenuAppletWindow::switch_to_category_overview(const std::string &selected_c + true)); + category_list_box->add(*item); + } +- all_apps_scrolled->set_visible(false); ++ all_app_view->set_visible(false); + category_list_scrolled->show_all(); + + if (selected_item) +@@ -536,6 +537,7 @@ void MenuAppletWindow::switch_to_apps_overview(double position, bool animation) + all_apps_scrolled->show_all(); + + menu_view_stack->set_visible_child(ALL_APPS_VIEW); ++ all_app_view->set_visible(true); + apps_list_stack->set_visible_child(APPS_LIST_PAGE); + if (position >= 0) + { +@@ -550,6 +552,7 @@ bool MenuAppletWindow::on_map_event(GdkEventAny *any_event) + + // Fix #53981 + category_list_scrolled->set_visible(false); ++ all_app_view->set_visible(true); + all_apps_scrolled->set_visible(true); + + on_search_stop(); +diff --git a/src/menu/menu-applet-window.h b/src/menu/menu-applet-window.h +index c9e9ad6..7a4d66d 100644 +--- a/src/menu/menu-applet-window.h ++++ b/src/menu/menu-applet-window.h +@@ -178,6 +178,7 @@ private: + Gtk::SearchEntry *search_entry; + Gtk::StackSwitcher *menu_view_stack_switcher; + Gtk::Stack *menu_view_stack; ++ Gtk::Box *all_app_view; + Gtk::Stack *apps_list_stack; + Gtk::Box *all_apps_page; /* */ + Gtk::Box *compact_favorites_view; /* 紧凑模式下的收藏夹页面 */ +-- +2.33.0 + diff --git a/kiran-menu.spec b/kiran-menu.spec index 7fe72ad..b7367ff 100644 --- a/kiran-menu.spec +++ b/kiran-menu.spec @@ -1,6 +1,6 @@ Name: kiran-menu Version: 2.3.0 -Release: 11 +Release: 12 Summary: Applets for mate panel from Kiran Desktop License: MulanPSL-2.0 @@ -17,6 +17,7 @@ Patch1007: 0002-feature-gitlab-Add-.gitlab-ci.yml.patch Patch1008: 0001-fix-tray-Fix-the-icon-location-error-when-system-res.patch Patch1009: 0001-fix-tray-Fix-the-dbus-icon-can-not-scaled-when-syste.patch Patch1010: 0001-feature-menu-Add-flat-class-for-button-to-keep-consi.patch +Patch1011: 0001-fix-menu-Fix-that-the-category-overlaps-the-search-b.patch BuildRequires: cmake > 3.0 @@ -97,6 +98,9 @@ gtk-update-icon-cache -f /usr/share/icons/hicolor/ %changelog +* Tue Nov 15 2022 tangjie02 - 2.3.0-12 +- KYOS-B: Fix that the category overlaps the search box after the start menu collapses the category list.(I60PSI) + * Thu Oct 13 2022 tangjie02 - 2.3.0-11 - KYOS-F: Add flat class for button to keep consistent with the color of color block.