|
 |
31004e6 |
From a4ff5d5fe50365bd4ba31addc3fa67b59aa59d78 Mon Sep 17 00:00:00 2001
|
|
|
31004e6 |
From: Vladimir Testov <vladimir.testov@rosalab.ru>
|
|
|
31004e6 |
Date: Mon, 29 Apr 2013 13:40:11 +0200
|
|
|
f74b50e |
Subject: [PATCH 392/482] * grub-core/gfxmenu/gui_list.c: Refresh
|
|
|
31004e6 |
first_shown_entry value when cached view is reused. *
|
|
|
31004e6 |
grub-core/gfxmenu/view.c: Call the refresh procedure for all open boot
|
|
|
31004e6 |
menus.
|
|
|
31004e6 |
|
|
|
31004e6 |
---
|
|
|
31004e6 |
ChangeLog | 7 +++++++
|
|
|
31004e6 |
grub-core/gfxmenu/gui_list.c | 13 ++++++++++++-
|
|
|
31004e6 |
grub-core/gfxmenu/view.c | 22 ++++++++++++++++++++++
|
|
|
31004e6 |
include/grub/gui.h | 2 ++
|
|
|
31004e6 |
4 files changed, 43 insertions(+), 1 deletion(-)
|
|
|
31004e6 |
|
|
|
31004e6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
31004e6 |
index eff0b6b..86effa0 100644
|
|
|
31004e6 |
--- a/ChangeLog
|
|
|
31004e6 |
+++ b/ChangeLog
|
|
|
31004e6 |
@@ -1,3 +1,10 @@
|
|
|
31004e6 |
+2013-04-29 Vladimir Testov <vladimir.testov@rosalab.ru>
|
|
|
31004e6 |
+
|
|
|
31004e6 |
+ * grub-core/gfxmenu/gui_list.c: Refresh first_shown_entry value when
|
|
|
31004e6 |
+ cached view is reused.
|
|
|
31004e6 |
+ * grub-core/gfxmenu/view.c: Call the refresh procedure for all
|
|
|
31004e6 |
+ open boot menus.
|
|
|
31004e6 |
+
|
|
|
31004e6 |
2013-04-29 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
|
|
|
31004e6 |
Unify more code in grub-install_header.
|
|
|
31004e6 |
diff --git a/grub-core/gfxmenu/gui_list.c b/grub-core/gfxmenu/gui_list.c
|
|
|
31004e6 |
index 1982d9a..a06603b 100644
|
|
|
31004e6 |
--- a/grub-core/gfxmenu/gui_list.c
|
|
|
31004e6 |
+++ b/grub-core/gfxmenu/gui_list.c
|
|
|
31004e6 |
@@ -541,6 +541,16 @@ list_set_view_info (void *vself,
|
|
|
31004e6 |
self->view = view;
|
|
|
31004e6 |
}
|
|
|
31004e6 |
|
|
|
31004e6 |
+/* Refresh list variables */
|
|
|
31004e6 |
+static void
|
|
|
31004e6 |
+list_refresh_info (void *vself,
|
|
|
31004e6 |
+ grub_gfxmenu_view_t view)
|
|
|
31004e6 |
+{
|
|
|
31004e6 |
+ list_impl_t self = vself;
|
|
|
31004e6 |
+ if (view->nested)
|
|
|
31004e6 |
+ self->first_shown_index = 0;
|
|
|
31004e6 |
+}
|
|
|
31004e6 |
+
|
|
|
31004e6 |
static struct grub_gui_component_ops list_comp_ops =
|
|
|
31004e6 |
{
|
|
|
31004e6 |
.destroy = list_destroy,
|
|
|
31004e6 |
@@ -557,7 +567,8 @@ static struct grub_gui_component_ops list_comp_ops =
|
|
|
31004e6 |
|
|
|
31004e6 |
static struct grub_gui_list_ops list_ops =
|
|
|
31004e6 |
{
|
|
|
31004e6 |
- .set_view_info = list_set_view_info
|
|
|
31004e6 |
+ .set_view_info = list_set_view_info,
|
|
|
31004e6 |
+ .refresh_list = list_refresh_info
|
|
|
31004e6 |
};
|
|
|
31004e6 |
|
|
|
31004e6 |
grub_gui_component_t
|
|
|
31004e6 |
diff --git a/grub-core/gfxmenu/view.c b/grub-core/gfxmenu/view.c
|
|
|
31004e6 |
index 6de96ca..475fc76 100644
|
|
|
31004e6 |
--- a/grub-core/gfxmenu/view.c
|
|
|
31004e6 |
+++ b/grub-core/gfxmenu/view.c
|
|
|
31004e6 |
@@ -237,6 +237,27 @@ update_menu_components (grub_gfxmenu_view_t view)
|
|
|
31004e6 |
}
|
|
|
31004e6 |
|
|
|
31004e6 |
static void
|
|
|
31004e6 |
+refresh_menu_visit (grub_gui_component_t component,
|
|
|
31004e6 |
+ void *userdata)
|
|
|
31004e6 |
+{
|
|
|
31004e6 |
+ grub_gfxmenu_view_t view;
|
|
|
31004e6 |
+ view = userdata;
|
|
|
31004e6 |
+ if (component->ops->is_instance (component, "list"))
|
|
|
31004e6 |
+ {
|
|
|
31004e6 |
+ grub_gui_list_t list = (grub_gui_list_t) component;
|
|
|
31004e6 |
+ list->ops->refresh_list (list, view);
|
|
|
31004e6 |
+ }
|
|
|
31004e6 |
+}
|
|
|
31004e6 |
+
|
|
|
31004e6 |
+/* Refresh list information (useful for submenus) */
|
|
|
31004e6 |
+static void
|
|
|
31004e6 |
+refresh_menu_components (grub_gfxmenu_view_t view)
|
|
|
31004e6 |
+{
|
|
|
31004e6 |
+ grub_gui_iterate_recursively ((grub_gui_component_t) view->canvas,
|
|
|
31004e6 |
+ refresh_menu_visit, view);
|
|
|
31004e6 |
+}
|
|
|
31004e6 |
+
|
|
|
31004e6 |
+static void
|
|
|
31004e6 |
draw_message (grub_gfxmenu_view_t view)
|
|
|
31004e6 |
{
|
|
|
31004e6 |
char *text = view->progress_message_text;
|
|
|
31004e6 |
@@ -294,6 +315,7 @@ grub_gfxmenu_view_draw (grub_gfxmenu_view_t view)
|
|
|
31004e6 |
view->screen.x, view->screen.y,
|
|
|
31004e6 |
view->screen.width, view->screen.height);
|
|
|
31004e6 |
|
|
|
31004e6 |
+ refresh_menu_components (view);
|
|
|
31004e6 |
update_menu_components (view);
|
|
|
31004e6 |
|
|
|
31004e6 |
grub_gfxmenu_view_redraw (view, &view->screen);
|
|
|
31004e6 |
diff --git a/include/grub/gui.h b/include/grub/gui.h
|
|
|
31004e6 |
index ef0795c..4b8ec89 100644
|
|
|
31004e6 |
--- a/include/grub/gui.h
|
|
|
31004e6 |
+++ b/include/grub/gui.h
|
|
|
31004e6 |
@@ -67,6 +67,8 @@ struct grub_gui_list_ops
|
|
|
31004e6 |
{
|
|
|
31004e6 |
void (*set_view_info) (void *self,
|
|
|
31004e6 |
grub_gfxmenu_view_t view);
|
|
|
31004e6 |
+ void (*refresh_list) (void *self,
|
|
|
31004e6 |
+ grub_gfxmenu_view_t view);
|
|
|
31004e6 |
};
|
|
|
31004e6 |
|
|
|
31004e6 |
struct grub_gui_progress_ops
|
|
|
31004e6 |
--
|
|
|
31004e6 |
1.8.2.1
|
|
|
31004e6 |
|