* Source/GSThemeDrawing.m:

* Headers/Additions/GNUstepGUI/GSTheme.h: Add methods
	-menuSubmenuHorizontalOverlap and -menuSubmenuVerticalOverlap
	wrapping user defaults GSMenuSubmenuHorizontalOverlap and
	GSMenuSubmenuVerticalOverlap
	* Source/NSMenuView.m (-locationForSubmenu:): Offset calculations
	by -[GSTheme menuSubmenuHorizontalOverlap] and
	-[GSTheme menuSubmenuVerticalOverlap]


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@37243 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,14 @@
+2013-10-15  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Source/GSThemeDrawing.m:
+	* Headers/Additions/GNUstepGUI/GSTheme.h: Add methods
+	-menuSubmenuHorizontalOverlap and -menuSubmenuVerticalOverlap
+	wrapping user defaults GSMenuSubmenuHorizontalOverlap and
+	GSMenuSubmenuVerticalOverlap
+	* Source/NSMenuView.m (-locationForSubmenu:): Offset calculations
+	by -[GSTheme menuSubmenuHorizontalOverlap] and
+	-[GSTheme menuSubmenuVerticalOverlap]
+
 2013-10-15  Eric Wasylishen  <ewasylishen@gmail.com>
 
 	* Source/GSThemePrivate.h:

Headers/Additions/GNUstepGUI/GSTheme.h

@@ -1084,6 +1084,22 @@ APPKIT_EXPORT	NSString	*GSThemeWillDeactivateNotification;
  * <p>Can be overridden in subclasses to return a custom value.</p>
  */
 - (CGFloat) menuSeparatorInset;
+
+/**
+ * Amount that submenus overlap their parent menu by, horizontally.
+ * (i.e. applies to vertical menus)
+ *
+ * Controlled by GSMenuSubmenuHorizontalOverlap default
+ */
+- (CGFloat) menuSubmenuHorizontalOverlap;
+
+/**
+ * Amount that submenus overlap the horizontal menu bar by, vertically.
+ *
+ * Controlled by GSMenuSubmenuVerticalOverlap default
+ */
+- (CGFloat) menuSubmenuVerticalOverlap;
+
 /**
  * <p>Draws a separator between normal menu items in a menu.</p>
  *

Source/GSThemeDrawing.m

@@ -1027,6 +1027,18 @@
   return 3.0;
 }
 
+- (CGFloat) menuSubmenuHorizontalOverlap
+{
+  return [[NSUserDefaults standardUserDefaults]
+				   floatForKey: @"GSMenuSubmenuHorizontalOverlap"];
+}
+
+- (CGFloat) menuSubmenuVerticalOverlap
+{
+  return [[NSUserDefaults standardUserDefaults]
+				   floatForKey: @"GSMenuSubmenuVerticalOverlap"];
+}
+
 - (void) drawSeparatorItemForMenuItemCell: (NSMenuItemCell *)cell
                                 withFrame: (NSRect)cellFrame
                                    inView: (NSView *)controlView

Source/NSMenuView.m

@@ -1111,6 +1111,8 @@ static float menuBarHeight = 0.0;
 {
   NSRect frame = [_window frame];
   NSRect submenuFrame;
+  const CGFloat submenuHorizOverlap = [[GSTheme theme] menuSubmenuHorizontalOverlap];
+  const CGFloat submenuVertOverlap = [[GSTheme theme] menuSubmenuVerticalOverlap];
 
   if (_needsSizing)
     [self sizeToFit];
@@ -1130,7 +1132,7 @@ static float menuBarHeight = 0.0;
             [_attachedMenu indexOfItemWithSubmenu: aSubmenu]] toView: nil];
           NSPoint subOrigin = [_window convertBaseToScreen: aRect.origin];
 
-          return NSMakePoint (NSMaxX(frame),
+          return NSMakePoint (NSMaxX(frame) - submenuHorizOverlap,
             subOrigin.y - NSHeight(submenuFrame) - 2 +
             2*[NSMenuView menuBarHeight]);
         }
@@ -1141,12 +1143,12 @@ static float menuBarHeight = 0.0;
           NSPoint subOrigin = [_window convertBaseToScreen: aRect.origin];
 
           // FIXME ... why is the offset +1 needed below? 
-          return NSMakePoint (NSMaxX(frame),
+          return NSMakePoint (NSMaxX(frame) - submenuHorizOverlap,
             subOrigin.y - NSHeight(submenuFrame) + aRect.size.height + 1);
         }
       else
         {
-          return NSMakePoint(NSMaxX(frame),
+          return NSMakePoint(NSMaxX(frame) - submenuHorizOverlap,
             NSMaxY(frame) - NSHeight(submenuFrame));
         }
     }
@@ -1162,12 +1164,12 @@ static float menuBarHeight = 0.0;
 	  NSWindows95InterfaceStyle)
 	{
 	  return NSMakePoint(subOrigin.x,
-			     subOrigin.y - NSHeight(submenuFrame) + 1);
+			     subOrigin.y - NSHeight(submenuFrame) + 1 + submenuVertOverlap);
 	}
       else
 	{
 	  return NSMakePoint(subOrigin.x,
-			     subOrigin.y - NSHeight(submenuFrame));
+			     subOrigin.y - NSHeight(submenuFrame) + submenuVertOverlap);
 	}
     }
 }