X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fguicast%2Fbcmenuitem.C;fp=cinelerra-5.0%2Fguicast%2Fbcmenuitem.C;h=66f869532b4ba1f8a7673659e2f698f2a278d49c;hb=e919ce8a71cdc99bb7344cc192e13a2c2db9e1c0;hp=f8dbfc91493656d71a2ac5bd6e079e4e5d5fa5df;hpb=6c0c8bd0e577001d1cc18c6c27d58e62f58a6bff;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/guicast/bcmenuitem.C b/cinelerra-5.0/guicast/bcmenuitem.C
index f8dbfc91..66f86953 100644
--- a/cinelerra-5.0/guicast/bcmenuitem.C
+++ b/cinelerra-5.0/guicast/bcmenuitem.C
@@ -26,6 +26,7 @@
 #include "bcpopup.h"
 #include "bcpopupmenu.h"
 #include "bcresources.h"
+#include "bcsignals.h"
 #include "bcwindowbase.h"
 #include "colors.h"
 
@@ -343,10 +344,14 @@ int BC_MenuItem::draw()
 			{
 				if(menu_popup->item_bg[MENUITEM_DN])
 				{
-					menu_popup->get_popup()->draw_9segment(MENUITEM_MARGIN,
+// 					menu_popup->get_popup()->draw_9segment(MENUITEM_MARGIN,
+// 						y,
+// 						menu_popup->get_w() - MENUITEM_MARGIN * 2,
+// 						h,
+// 						menu_popup->item_bg[MENUITEM_DN]);
+					menu_popup->get_popup()->draw_3segmenth(MENUITEM_MARGIN,
 						y,
 						menu_popup->get_w() - MENUITEM_MARGIN * 2,
-						h,
 						menu_popup->item_bg[MENUITEM_DN]);
 				}
 				else
@@ -368,10 +373,14 @@ int BC_MenuItem::draw()
 			{
 				if(menu_popup->item_bg[MENUITEM_HI])
 				{
-					menu_popup->get_popup()->draw_9segment(MENUITEM_MARGIN,
+// 					menu_popup->get_popup()->draw_9segment(MENUITEM_MARGIN,
+// 						y,
+// 						menu_popup->get_w() - MENUITEM_MARGIN * 2,
+// 						h,
+// 						menu_popup->item_bg[MENUITEM_HI]);
+					menu_popup->get_popup()->draw_3segmenth(MENUITEM_MARGIN,
 						y,
 						menu_popup->get_w() - MENUITEM_MARGIN * 2,
-						h,
 						menu_popup->item_bg[MENUITEM_HI]);
 				}
 				else
@@ -391,10 +400,17 @@ int BC_MenuItem::draw()
 		  }
 		if(checked)
 		{
-			menu_popup->get_popup()->draw_check(10 + offset, y + 2 + offset);
+//			menu_popup->get_popup()->draw_check(10 + offset, y + 2 + offset);
+			menu_popup->get_popup()->draw_pixmap(menu_popup->check,
+				offset, 
+				y + (this->h - menu_popup->check->get_h()) / 2 + offset);
 			menu_popup->get_popup()->set_font(MEDIUMFONT);
-			menu_popup->get_popup()->draw_text(30 + offset, y + h - text_line - 2 + offset, text);
-			menu_popup->get_popup()->draw_text(menu_popup->get_key_x() + offset, y + h - text_line - 2 + offset, hotkey_text);
+			menu_popup->get_popup()->draw_text(menu_popup->check->get_w() + offset, 
+				y + h - text_line - 2 + offset, 
+				text);
+			menu_popup->get_popup()->draw_text(menu_popup->get_key_x() + offset, 
+				y + h - text_line - 2 + offset, 
+				hotkey_text);
 		}
 		else
 		{