Merge branch 'master' of git://github.com/derf/feh

5 files changed, 2 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index d1a769f..4a8be81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ git HEAD
     * Dennis Real: EXIF mode fixes, support for more camera models
     * feh(1): Document behaviour for duplicate key bindings
       <https://github.com/derf/feh/issues/91>
+    * menu: simpler background, remove drop shadows
 
 Sun, 25 Mar 2012 13:13:26 +0200  Daniel Friesel <derf@finalrewind.org>
 
diff --git a/share/fonts/black.style b/share/fonts/black.style
index d2a86a9..21827d3 100644
--- a/share/fonts/black.style
+++ b/share/fonts/black.style
@@ -1,4 +1,3 @@
 #Style
 #NAME Menu
-255 255 255 64 2 2
 255 255 255 255 0 0
diff --git a/share/fonts/menu.style b/share/fonts/menu.style
index 8557360..e448873 100644
--- a/share/fonts/menu.style
+++ b/share/fonts/menu.style
@@ -1,4 +1,3 @@
 #Style
 #NAME Menu
-0 0 0 64 2 2
 0 0 0 0 0 0
diff --git a/share/images/menubg_default.png b/share/images/menubg_default.png
index dd21188..7f3b6a9 100644
--- a/share/images/menubg_default.png
+++ b/share/images/menubg_default.png
diff --git a/src/menu.c b/src/menu.c
index ecf98dd..8caff10 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -805,14 +805,6 @@ void feh_menu_draw_submenu_at(int x, int y, Imlib_Image dst, int ox, int oy)
 	y -= oy;
 
 	imlib_context_set_image(dst);
-	poly = imlib_polygon_new();
-	imlib_polygon_add_point(poly, x + 2, y + 5);
-	imlib_polygon_add_point(poly, x + 5, y + 7);
-	imlib_polygon_add_point(poly, x + 2, y + 11);
-	imlib_context_set_color(0, 0, 0, 60);
-	imlib_image_fill_polygon(poly);
-	imlib_polygon_free(poly);
-
 
 	poly = imlib_polygon_new();
 	imlib_polygon_add_point(poly, x, y + 3);
@@ -835,7 +827,7 @@ void feh_menu_item_draw_at(int x, int y, int w, int h, Imlib_Image dst, int ox,
 {
 	imlib_context_set_image(dst);
 	if (selected)
-		gib_imlib_image_fill_rectangle(dst, x - ox, y - oy, w, h, 255, 255, 255, 178);
+		gib_imlib_image_fill_rectangle(dst, x - ox, y - oy, w, h, 127, 127, 127, 178);
 	return;
 }