From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UxI12-0003D1-1P for mharc-grub-devel@gnu.org; Thu, 11 Jul 2013 10:38:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UxI0y-00039B-2W for grub-devel@gnu.org; Thu, 11 Jul 2013 10:38:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UxI0w-00015e-P3 for grub-devel@gnu.org; Thu, 11 Jul 2013 10:38:36 -0400 Received: from collab.rosalab.ru ([195.19.76.181]:48264) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UxI0w-00014r-4N for grub-devel@gnu.org; Thu, 11 Jul 2013 10:38:34 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by collab.rosalab.ru (Postfix) with ESMTP id 22F8729C233 for ; Thu, 11 Jul 2013 18:38:30 +0400 (MSK) X-Virus-Scanned: amavisd-new at rosalab.ru Received: from collab.rosalab.ru ([127.0.0.1]) by localhost (collab.rosalab.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fRzr-hneiTQg for ; Thu, 11 Jul 2013 18:38:29 +0400 (MSK) Received: from icedphoenix.localnet (unknown [217.199.216.178]) by collab.rosalab.ru (Postfix) with ESMTPSA id C2D8C29C231 for ; Thu, 11 Jul 2013 18:38:29 +0400 (MSK) From: Vladimir Testov To: grub-devel@gnu.org Subject: [PATCH] [2/?] grub-core/gfxmenu/gui_list.c - menu entry's width bug Date: Thu, 11 Jul 2013 18:38:28 +0400 Message-ID: <1868412.oolFDJMQUh@icedphoenix> User-Agent: KMail/4.10.2 (Linux/3.8.0-19-generic; KDE/4.10.2; x86_64; ; ) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart2975230.n9AksMvEYG" Content-Transfer-Encoding: 7Bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 195.19.76.181 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jul 2013 14:38:38 -0000 This is a multi-part message in MIME format. --nextPart2975230.n9AksMvEYG Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" You can see a graphical bug while using pixmap styled box of the selected menu entry. If the line is long enough or the font size is big enough, then the text of the selected menu entry will be drawn on the styled box. See screenshots. -- With best regards, _______________________________ Vladimir Testov, ROSA Laboratory. www.rosalab.ru --nextPart2975230.n9AksMvEYG Content-Disposition: attachment; filename="after-text-width-OK.png" Content-Transfer-Encoding: base64 Content-Type: image/png; name="after-text-width-OK.png" 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 qIkAAAAASUVORK5CYII= --nextPart2975230.n9AksMvEYG Content-Disposition: attachment; filename="before-text-width-bug.png" Content-Transfer-Encoding: base64 Content-Type: image/png; name="before-text-width-bug.png" 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 AElFTkSuQmCC --nextPart2975230.n9AksMvEYG Content-Disposition: attachment; filename="grub-list-entry-width-fix.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="grub-list-entry-width-fix.patch" diff -Naur grub-new/grub-core/gfxmenu/gui_list.c grub-new2/grub-core/gfxmenu/gui_list.c --- grub-new/grub-core/gfxmenu/gui_list.c 2013-07-09 15:27:35.337936761 +0400 +++ grub-new2/grub-core/gfxmenu/gui_list.c 2013-07-11 18:17:38.856943765 +0400 @@ -249,6 +249,19 @@ oviewport.width - 2 * boxpad, oviewport.height - 2 * boxpad); + int cwidth = oviewport.width - 2 * boxpad - 2; + if (selbox->get_border_width) + cwidth -= selbox->get_border_width (selbox); + selbox->set_content_size (selbox, cwidth, item_height); + + int string_left_offset = self->icon_width + icon_text_space; + int string_top_offset = (item_height - (ascent + descent)) / 2 + ascent; + + grub_video_rect_t svpsave, sviewport; + sviewport.x = sel_leftpad + string_left_offset; + sviewport.width = cwidth - string_left_offset; + sviewport.height = item_height; + for (visible_index = 0, menu_index = self->first_shown_index; visible_index < num_shown_items && menu_index < self->view->menu->size; visible_index++, menu_index++) @@ -258,10 +271,6 @@ if (is_selected) { - int cwidth = oviewport.width - 2 * boxpad - 2; - if (selbox->get_border_width) - cwidth -= selbox->get_border_width (selbox); - selbox->set_content_size (selbox, cwidth, item_height); selbox->draw (selbox, 0, item_top - sel_toppad); } @@ -283,12 +292,15 @@ ((is_selected && self->selected_item_color_set) ? self->selected_item_color : self->item_color); + + sviewport.y = item_top; + grub_gui_set_viewport (&sviewport, &svpsave); grub_font_draw_string (item_title, font, grub_video_map_rgba_color (text_color), - sel_leftpad + self->icon_width + icon_text_space, - (item_top + (item_height - (ascent + descent)) - / 2 + ascent)); + 0, + string_top_offset); + grub_gui_restore_viewport (&svpsave); item_top += item_height + item_vspace; } --nextPart2975230.n9AksMvEYG--