Merge branch 'feature/remove_hover_from_menus' of git://github.com/to…

…aster/fyne

internal/driver/glfw/menu_bar_item.go

@@ -19,8 +19,9 @@ type menuBarItem struct {
 	Menu   *fyne.Menu
 	Parent *MenuBar
 
-	active bool
-	child  *publicWidget.Menu
+	active  bool
+	child   *publicWidget.Menu
+	hovered bool
 }
 
 func (i *menuBarItem) Child() *publicWidget.Menu {
@@ -81,33 +82,43 @@ func (i *menuBarItem) MinSize() fyne.Size {
 	return widget.MinSizeOf(i)
 }
 
-// MouseIn shows the menu if the bar is active.
+// MouseIn activates the item and shows the menu if the bar is active.
 // The menu that was displayed before will be hidden.
 //
+// If the bar is not active, the item will be hovered.
+//
 // Implements: desktop.Hoverable
 func (i *menuBarItem) MouseIn(_ *desktop.MouseEvent) {
+	i.hovered = true
 	if i.Parent.active {
 		i.Parent.canvas.Focus(i)
 	}
+	i.Refresh()
 }
 
-// MouseMoved shows the menu if the bar is active.
+// MouseMoved activates the item and shows the menu if the bar is active.
 // The menu that was displayed before will be hidden.
 // This might have an effect when mouse and keyboard control are mixed.
 // Changing the active menu with the keyboard will make the hovered menu bar item inactive.
 // On the next mouse move the hovered item is activated again.
 //
+// If the bar is not active, this will do nothing.
+//
 // Implements: desktop.Hoverable
 func (i *menuBarItem) MouseMoved(_ *desktop.MouseEvent) {
 	if i.Parent.active {
 		i.Parent.canvas.Focus(i)
 	}
 }
 
-// MouseOut does nothing.
+// MouseOut does nothing if the bar is active.
+//
+// IF the bar is not active, it changes the item to not be hovered.
 //
 // Implements: desktop.Hoverable
 func (i *menuBarItem) MouseOut() {
+	i.hovered = false
+	i.Refresh()
 }
 
 // Move sets the position of the widget relative to its parent.
@@ -194,6 +205,9 @@ func (r *menuBarItemRenderer) Refresh() {
 	if r.i.active && r.i.Parent.active {
 		r.background.FillColor = theme.FocusColor()
 		r.background.Show()
+	} else if r.i.hovered && !r.i.Parent.active {
+		r.background.FillColor = theme.HoverColor()
+		r.background.Show()
 	} else {
 		r.background.Hide()
 	}