Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-08 21:10:06 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add missing AuiToolBarItem HoverBitmap code

Browse Source 
Add in code that wasn't existing that makes the HoverBitmap show when
mouse is in a hovered upon or pressed state over a AuiToolBarItem.
This commit is contained in:
Metallicow
2015-02-23 23:18:36 -06:00
parent 693355141c
commit bae97ff7f2
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
wx/lib/agw/aui/auibar.py
View File

@@ -996,7 +996,7 @@ class AuiDefaultToolBarArt(object):
def DrawButton(self, dc, wnd, item, rect):
"""
Draws a toolbar item button.
:param `dc`: a :class:`DC` device context;
:param `wnd`: a :class:`Window` derived window;
:param `item`: an instance of :class:`AuiToolBarItem`;
@@ -1004,17 +1004,17 @@ class AuiDefaultToolBarArt(object):
"""
bmp_rect, text_rect = self.GetToolsPosition(dc, item, rect)
if not item.GetState() & AUI_BUTTON_STATE_DISABLED:
if item.GetState() & AUI_BUTTON_STATE_PRESSED:
dc.SetPen(wx.Pen(self._highlight_colour))
dc.SetBrush(wx.Brush(StepColour(self._highlight_colour, 150)))
dc.DrawRectangle(rect)
elif item.GetState() & AUI_BUTTON_STATE_HOVER or item.IsSticky():
dc.SetPen(wx.Pen(self._highlight_colour))
dc.SetBrush(wx.Brush(StepColour(self._highlight_colour, 170)))
@@ -1024,17 +1024,22 @@ class AuiDefaultToolBarArt(object):
dc.SetBrush(wx.Brush(StepColour(self._highlight_colour, 180)))
dc.DrawRectangle(rect)
elif item.GetState() & AUI_BUTTON_STATE_CHECKED:
# it's important to put this code in an else statment after the
# hover, otherwise hovers won't draw properly for checked items
dc.SetPen(wx.Pen(self._highlight_colour))
dc.SetBrush(wx.Brush(StepColour(self._highlight_colour, 170)))
dc.DrawRectangle(rect)
if item.GetState() & AUI_BUTTON_STATE_DISABLED:
bmp = item.GetDisabledBitmap()
elif item.GetState() & AUI_BUTTON_STATE_HOVER or \
item.GetState() & AUI_BUTTON_STATE_PRESSED:
bmp = item.GetHoverBitmap()
if not bmp:
bmp = item.GetBitmap()
else:
bmp = item.GetBitmap()
@@ -1048,7 +1053,7 @@ class AuiDefaultToolBarArt(object):
if self._agwFlags & AUI_TB_TEXT and item.GetLabel() != "":
self.DrawLabel(dc, wnd, item, text_rect)
def DrawDropDownButton(self, dc, wnd, item, rect):
"""