72 lines
2.7 KiB
Diff
72 lines
2.7 KiB
Diff
From 9933ff89f98c176e7ce097500004ab3da860fb81 Mon Sep 17 00:00:00 2001
|
|
From: tangjie02 <tangjie02@kylinsec.com.cn>
|
|
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 <tangjie02@kylinsec.com.cn>
|
|
---
|
|
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<Gtk::Box>("menu-sider-container", sider_box);
|
|
builder->get_widget<Gtk::StackSwitcher>("menu-view-stack-switcher", menu_view_stack_switcher);
|
|
builder->get_widget<Gtk::Stack>("menu-view-stack", menu_view_stack);
|
|
+ builder->get_widget<Gtk::Box>("all-apps-view", all_app_view);
|
|
builder->get_widget<Gtk::Stack>("apps-list-stack", apps_list_stack);
|
|
|
|
builder->get_widget<Gtk::Box>("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
|
|
|