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

Merge pull request #1896 from kdschlosser/fixes_floating_point_math

Browse Source 
Fixes floating point math in wx.lib.agw.aui
This commit is contained in:
Robin Dunn
2021-01-18 14:44:56 -08:00
committed by GitHub
parent bcc9510f39 7afcc7fbc6
commit e32ba711f1
6 changed files with 409 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wx/lib/agw/aui/aui_switcherdialog.py
View File

@@ -621,12 +621,12 @@ class SwitcherItems(object):
and item.GetBitmap().GetHeight() <= 16:
x -= textMarginX
dc.DrawBitmap(item.GetBitmap(), x, item.GetRect().y + \
(item.GetRect().height - item.GetBitmap().GetHeight())/2,
(item.GetRect().height - item.GetBitmap().GetHeight())//2,
True)
x += 16 + textMarginX
#x += textMarginX
y = item.GetRect().y + (item.GetRect().height - h)/2
y = item.GetRect().y + (item.GetRect().height - h)//2
dc.DrawText(item.GetTitle(), x, y)
dc.DestroyClippingRegion()

17
wx/lib/agw/aui/aui_utilities.py
View File

@@ -322,9 +322,9 @@ def DarkenBitmap(bmp, caption_colour, new_colour):
"""
image = bmp.ConvertToImage()
red = caption_colour.Red()/float(new_colour.Red())
green = caption_colour.Green()/float(new_colour.Green())
blue = caption_colour.Blue()/float(new_colour.Blue())
red = caption_colour.Red()/new_colour.Red()
green = caption_colour.Green()/new_colour.Green()
blue = caption_colour.Blue()/new_colour.Blue()
image = image.AdjustChannels(red, green, blue)
return image.ConvertToBitmap()
@@ -584,13 +584,13 @@ def RescaleScreenShot(bmp, thumbnail_size=200):
if bmpW > bmpH:
if bmpW > thumbnail_size:
ratio = bmpW/float(thumbnail_size)
newW, newH = int(bmpW/ratio), int(bmpH/ratio)
ratio = bmpW/thumbnail_size
newW, newH = bmpW//ratio, bmpH//ratio
img.Rescale(newW, newH, wx.IMAGE_QUALITY_HIGH)
else:
if bmpH > thumbnail_size:
ratio = bmpH/float(thumbnail_size)
newW, newH = int(bmpW/ratio), int(bmpH/ratio)
ratio = bmpH/thumbnail_size
newW, newH = bmpW//ratio, bmpH//ratio
img.Rescale(newW, newH, wx.IMAGE_QUALITY_HIGH)
newBmp = img.ConvertToBitmap()
@@ -667,3 +667,6 @@ def CopyAttributes(newArt, oldArt):
return newArt

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

@@ -979,16 +979,16 @@ class AuiDefaultToolBarArt(object):
if orient == AUI_TBTOOL_HORIZONTAL:
text_x = rect.x
text_y = rect.y + (rect.height-text_height)/2
text_y = rect.y + (rect.height-text_height)//2
dc.DrawText(item.GetLabel(), text_x, text_y)
elif orient == AUI_TBTOOL_VERT_CLOCKWISE:
text_x = rect.x + (rect.width+text_width)/2
text_x = rect.x + (rect.width+text_width)//2
text_y = rect.y
dc.DrawRotatedText(item.GetLabel(), text_x, text_y, 270)
elif AUI_TBTOOL_VERT_COUNTERCLOCKWISE:
text_x = rect.x + (rect.width-text_width)/2
text_x = rect.x + (rect.width-text_width)//2
text_y = rect.y + text_height
dc.DrawRotatedText(item.GetLabel(), text_x, text_y, 90)
@@ -1086,8 +1086,8 @@ class AuiDefaultToolBarArt(object):
dropbmp_width = dropbmp_height
dropbmp_height = tmp
dropbmp_x = dropdown_rect.x + (dropdown_rect.width/2) - dropbmp_width/2
dropbmp_y = dropdown_rect.y + (dropdown_rect.height/2) - dropbmp_height/2
dropbmp_x = dropdown_rect.x + (dropdown_rect.width//2) - dropbmp_width//2
dropbmp_y = dropdown_rect.y + (dropdown_rect.height//2) - dropbmp_height//2
bmp_rect, text_rect = self.GetToolsPosition(dc, item, button_rect)
@@ -1171,7 +1171,7 @@ class AuiDefaultToolBarArt(object):
# set the label's text colour
dc.SetTextForeground(wx.BLACK)
text_x = rect.x + (rect.width/2) - (text_width/2) + 1
text_x = rect.x + (rect.width//2) - (text_width//2) + 1
text_y = rect.y + rect.height - text_height - 1
if self._agwFlags & AUI_TB_TEXT and item.GetLabel() != "":
@@ -1264,18 +1264,18 @@ class AuiDefaultToolBarArt(object):
if horizontal:
rect.x += (rect.width/2)
rect.x += (rect.width//2)
rect.width = 1
new_height = (rect.height*3)/4
rect.y += (rect.height/2) - (new_height/2)
new_height = (rect.height*3)//4
rect.y += (rect.height//2) - (new_height//2)
rect.height = new_height
else:
rect.y += (rect.height/2)
rect.y += (rect.height//2)
rect.height = 1
new_width = (rect.width*3)/4
rect.x += (rect.width/2) - (new_width/2)
new_width = (rect.width*3)//4
rect.x += (rect.width//2) - (new_width//2)
rect.width = new_width
start_colour = StepColour(self._base_colour, 80)
@@ -1359,8 +1359,8 @@ class AuiDefaultToolBarArt(object):
dc.SetBrush(wx.Brush(light_gray_bg))
dc.DrawRectangle(rect.x+1, rect.y, rect.width, rect.height)
x = rect.x + 1 + (rect.width-self._overflow_bmp.GetWidth())/2
y = rect.y + 1 + (rect.height-self._overflow_bmp.GetHeight())/2
x = rect.x + 1 + (rect.width-self._overflow_bmp.GetWidth())//2
y = rect.y + 1 + (rect.height-self._overflow_bmp.GetHeight())//2
dc.DrawBitmap(self._overflow_bmp, x, y, True)
@@ -1492,21 +1492,21 @@ class AuiDefaultToolBarArt(object):
bmp_x = bmp_y = text_x = text_y = 0
if horizontal and text_bottom:
bmp_x = rect.x + (rect.width/2) - (bmp_width/2)
bmp_x = rect.x + (rect.width//2) - (bmp_width//2)
bmp_y = rect.y + 3
text_x = rect.x + (rect.width/2) - (text_width/2)
text_x = rect.x + (rect.width//2) - (text_width//2)
text_y = rect.y + ((bmp_y - rect.y) * 2) + bmp_height
elif horizontal and text_right:
bmp_x = rect.x + 3
bmp_y = rect.y + (rect.height/2) - (bmp_height / 2)
bmp_y = rect.y + (rect.height//2) - (bmp_height // 2)
text_x = rect.x + ((bmp_x - rect.x) * 2) + bmp_width
text_y = rect.y + (rect.height/2) - (text_height/2)
text_y = rect.y + (rect.height//2) - (text_height//2)
elif not horizontal and text_bottom:
bmp_x = rect.x + (rect.width / 2) - (bmp_width / 2)
bmp_x = rect.x + (rect.width // 2) - (bmp_width // 2)
bmp_y = rect.y + 3
text_x = rect.x + (rect.width / 2) - (text_width / 2)
text_x = rect.x + (rect.width // 2) - (text_width // 2)
text_y = rect.y + ((bmp_y - rect.y) * 2) + bmp_height
bmp_rect = wx.Rect(bmp_x, bmp_y, bmp_width, bmp_height)
@@ -3257,9 +3257,6 @@ class AuiToolBar(wx.Control):
def DoIdleUpdate(self):
""" Updates the toolbar during idle times. """
if not self:
return # The action Destroyed the toolbar!
handler = self.GetEventHandler()
if not handler:
return
@@ -4031,3 +4028,4 @@ class AuiToolBar(wx.Control):
manager = self.GetAuiManager()
manager.StopPreviewTimer()

6
wx/lib/agw/aui/auibook.py
View File

@@ -175,7 +175,7 @@ class TabTextCtrl(ExpandoTextCtrl):
x += image_w
w -= image_w + 4
y = (self._tabEdited.rect.height - h)/2 + 1
y = (self._tabEdited.rect.height - h)//2 + 1
expandoStyle = wx.WANTS_CHARS
if wx.Platform in ["__WXGTK__", "__WXMAC__"]:
@@ -864,7 +864,7 @@ class TabNavigatorWindow(wx.Dialog):
# Draw the caption title and place the bitmap
# get the bitmap optimal position, and draw it
bmpPt, txtPt = wx.Point(), wx.Point()
bmpPt.y = (rect.height - self._props.Icon.GetHeight())/2
bmpPt.y = (rect.height - self._props.Icon.GetHeight())//2
bmpPt.x = 3
mem_dc.DrawBitmap(self._props.Icon, bmpPt.x, bmpPt.y, True)
@@ -875,7 +875,7 @@ class TabNavigatorWindow(wx.Dialog):
fontHeight = mem_dc.GetCharHeight()
txtPt.x = bmpPt.x + self._props.Icon.GetWidth() + 4
txtPt.y = (rect.height - fontHeight)/2
txtPt.y = (rect.height - fontHeight)//2
mem_dc.SetTextForeground(wx.WHITE)
mem_dc.DrawText("Opened tabs:", txtPt.x, txtPt.y)
mem_dc.SelectObject(wx.NullBitmap)

1003
wx/lib/agw/aui/framemanager.py
View File

File diff suppressed because it is too large Load Diff

104
wx/lib/agw/aui/tabart.py
View File

@@ -301,13 +301,13 @@ class AuiDefaultTabArt(object):
tot_width -= self._active_windowlist_bmp.GetWidth()
if tab_count > 0:
self._fixed_tab_width = tot_width/tab_count
self._fixed_tab_width = tot_width//tab_count
if self._fixed_tab_width < 100:
self._fixed_tab_width = 100
if self._fixed_tab_width > tot_width/2:
self._fixed_tab_width = tot_width/2
if self._fixed_tab_width > tot_width//2:
self._fixed_tab_width = tot_width//2
if self._fixed_tab_width > 220:
self._fixed_tab_width = 220
@@ -474,7 +474,7 @@ class AuiDefaultTabArt(object):
dc.DrawPoint(r.x+r.width-2, r.y+1)
# set rectangle down a bit for gradient drawing
r.SetHeight(r.GetHeight()/2)
r.SetHeight(r.GetHeight()//2)
r.x += 2
r.width -= 2
r.y += r.height
@@ -497,7 +497,7 @@ class AuiDefaultTabArt(object):
r.x += 3
r.y += 1
r.width -= 4
r.height /= 2
r.height //= 2
r.height -= 1
# -- draw top gradient fill for glossy look
@@ -555,7 +555,7 @@ class AuiDefaultTabArt(object):
# draw bitmap
dc.DrawBitmap(pagebitmap,
bitmap_offset,
drawn_tab_yoff + (drawn_tab_height/2) - (pagebitmap.GetHeight()/2),
drawn_tab_yoff + (drawn_tab_height//2) - (pagebitmap.GetHeight()//2),
True)
text_offset = bitmap_offset + pagebitmap.GetWidth()
@@ -568,7 +568,7 @@ class AuiDefaultTabArt(object):
draw_text = ChopText(dc, caption, tab_width - (text_offset-tab_x) - close_button_width)
ypos = drawn_tab_yoff + (drawn_tab_height)/2 - (texty/2) - 1
ypos = drawn_tab_yoff + (drawn_tab_height)//2 - (texty//2) - 1
offset_focus = text_offset
if control:
@@ -609,11 +609,11 @@ class AuiDefaultTabArt(object):
shift = (agwFlags & AUI_NB_BOTTOM and [1] or [0])[0]
if agwFlags & AUI_NB_CLOSE_ON_TAB_LEFT:
rect = wx.Rect(tab_x + 4, tab_y + (tab_height - bmp.GetHeight())/2 - shift,
rect = wx.Rect(tab_x + 4, tab_y + (tab_height - bmp.GetHeight())//2 - shift,
close_button_width, tab_height)
else:
rect = wx.Rect(tab_x + tab_width - close_button_width - 1,
tab_y + (tab_height - bmp.GetHeight())/2 - shift,
tab_y + (tab_height - bmp.GetHeight())//2 - shift,
close_button_width, tab_height)
rect = IndentPressedBitmap(rect, close_button_state)
@@ -777,14 +777,14 @@ class AuiDefaultTabArt(object):
if orientation == wx.LEFT:
rect.SetX(in_rect.x)
rect.SetY(((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2))
rect.SetY(((in_rect.y + in_rect.height)//2) - (bmp.GetHeight()//2))
rect.SetWidth(bmp.GetWidth())
rect.SetHeight(bmp.GetHeight())
else:
rect = wx.Rect(in_rect.x + in_rect.width - bmp.GetWidth(),
((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2),
((in_rect.y + in_rect.height)//2) - (bmp.GetHeight()//2),
bmp.GetWidth(), bmp.GetHeight())
rect = IndentPressedBitmap(rect, button_state)
@@ -819,11 +819,11 @@ class AuiDefaultTabArt(object):
if page.active and wx.Window.FindFocus() == wnd:
focusRectText = wx.Rect(text_offset, (drawn_tab_yoff + (drawn_tab_height)/2 - (texty/2)),
focusRectText = wx.Rect(text_offset, (drawn_tab_yoff + (drawn_tab_height)//2 - (texty//2)),
textx, texty)
if page.bitmap.IsOk():
focusRectBitmap = wx.Rect(bitmap_offset, drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetHeight()/2),
focusRectBitmap = wx.Rect(bitmap_offset, drawn_tab_yoff + (drawn_tab_height//2) - (page.bitmap.GetHeight()//2),
page.bitmap.GetWidth(), page.bitmap.GetHeight())
if page.bitmap.IsOk() and draw_text == "":
@@ -1110,13 +1110,13 @@ class AuiSimpleTabArt(object):
tot_width -= self._active_windowlist_bmp.GetWidth()
if tab_count > 0:
self._fixed_tab_width = tot_width/tab_count
self._fixed_tab_width = tot_width//tab_count
if self._fixed_tab_width < 100:
self._fixed_tab_width = 100
if self._fixed_tab_width > tot_width/2:
self._fixed_tab_width = tot_width/2
if self._fixed_tab_width > tot_width//2:
self._fixed_tab_width = tot_width//2
if self._fixed_tab_width > 220:
self._fixed_tab_width = 220
@@ -1238,23 +1238,23 @@ class AuiSimpleTabArt(object):
close_button_width = self._active_close_bmp.GetWidth()
if agwFlags & AUI_NB_CLOSE_ON_TAB_LEFT:
if control:
text_offset = tab_x + (tab_height/2) + close_button_width - (textx/2) - 2
text_offset = tab_x + (tab_height//2) + close_button_width - (textx//2) - 2
else:
text_offset = tab_x + (tab_height/2) + ((tab_width+close_button_width)/2) - (textx/2) - 2
text_offset = tab_x + (tab_height//2) + ((tab_width+close_button_width)//2) - (textx//2) - 2
else:
if control:
text_offset = tab_x + (tab_height/2) + close_button_width - (textx/2)
text_offset = tab_x + (tab_height//2) + close_button_width - (textx//2)
else:
text_offset = tab_x + (tab_height/2) + ((tab_width-close_button_width)/2) - (textx/2)
text_offset = tab_x + (tab_height//2) + ((tab_width-close_button_width)//2) - (textx//2)
else:
text_offset = tab_x + (tab_height/3) + (tab_width/2) - (textx/2)
text_offset = tab_x + (tab_height//3) + (tab_width//2) - (textx//2)
if control:
if agwFlags & AUI_NB_CLOSE_ON_TAB_LEFT:
text_offset = tab_x + (tab_height/3) - (textx/2) + close_button_width + 2
text_offset = tab_x + (tab_height//3) - (textx//2) + close_button_width + 2
else:
text_offset = tab_x + (tab_height/3) - (textx/2)
text_offset = tab_x + (tab_height//3) - (textx//2)
# set minimum text offset
if text_offset < tab_x + tab_height:
@@ -1267,7 +1267,7 @@ class AuiSimpleTabArt(object):
draw_text = ChopText(dc, caption,
tab_width - (text_offset-tab_x) - close_button_width)
ypos = (tab_y + tab_height)/2 - (texty/2) + 1
ypos = (tab_y + tab_height)//2 - (texty//2) + 1
if control:
if control.GetPosition() != wx.Point(text_offset+1, ypos):
@@ -1290,7 +1290,7 @@ class AuiSimpleTabArt(object):
# draw focus rectangle
if page.active and wx.Window.FindFocus() == wnd and (agwFlags & AUI_NB_NO_TAB_FOCUS) == 0:
focusRect = wx.Rect(text_offset, ((tab_y + tab_height)/2 - (texty/2) + 1),
focusRect = wx.Rect(text_offset, ((tab_y + tab_height)//2 - (texty//2) + 1),
selected_textx, selected_texty)
focusRect.Inflate(2, 2)
@@ -1310,11 +1310,11 @@ class AuiSimpleTabArt(object):
if agwFlags & AUI_NB_CLOSE_ON_TAB_LEFT:
rect = wx.Rect(tab_x + tab_height - 2,
tab_y + (tab_height/2) - (bmp.GetHeight()/2) + 1,
tab_y + (tab_height//2) - (bmp.GetHeight()//2) + 1,
close_button_width, tab_height - 1)
else:
rect = wx.Rect(tab_x + tab_width - close_button_width - 1,
tab_y + (tab_height/2) - (bmp.GetHeight()/2) + 1,
tab_y + (tab_height//2) - (bmp.GetHeight()//2) + 1,
close_button_width, tab_height - 1)
self.DrawButtons(dc, rect, bmp, wx.WHITE, close_button_state)
@@ -1389,7 +1389,7 @@ class AuiSimpleTabArt(object):
controlW, controlH = control.GetSize()
tab_width += controlW + 4
x_extent = tab_width - (tab_height/2) - 1
x_extent = tab_width - (tab_height//2) - 1
return (tab_width, tab_height), x_extent
@@ -1445,14 +1445,14 @@ class AuiSimpleTabArt(object):
if orientation == wx.LEFT:
rect.SetX(in_rect.x)
rect.SetY(((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2))
rect.SetY(((in_rect.y + in_rect.height)//2) - (bmp.GetHeight()//2))
rect.SetWidth(bmp.GetWidth())
rect.SetHeight(bmp.GetHeight())
else:
rect = wx.Rect(in_rect.x + in_rect.width - bmp.GetWidth(),
((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2),
((in_rect.y + in_rect.height)//2) - (bmp.GetHeight()//2),
bmp.GetWidth(), bmp.GetHeight())
self.DrawButtons(dc, rect, bmp, wx.WHITE, button_state)
@@ -1753,7 +1753,7 @@ class VC71TabArt(AuiDefaultTabArt):
# draw bitmap
dc.DrawBitmap(pagebitmap, bitmap_offset,
drawn_tab_yoff + (drawn_tab_height/2) - (pagebitmap.GetHeight()/2) + shift,
drawn_tab_yoff + (drawn_tab_height//2) - (pagebitmap.GetHeight()//2) + shift,
True)
text_offset = bitmap_offset + pagebitmap.GetWidth()
@@ -1778,7 +1778,7 @@ class VC71TabArt(AuiDefaultTabArt):
draw_text = ChopText(dc, caption, tab_width - (text_offset-tab_x) - close_button_width)
ypos = drawn_tab_yoff + (drawn_tab_height)/2 - (texty/2) - 1 + shift
ypos = drawn_tab_yoff + (drawn_tab_height)//2 - (texty//2) - 1 + shift
offset_focus = text_offset
@@ -1821,11 +1821,11 @@ class VC71TabArt(AuiDefaultTabArt):
if agwFlags & AUI_NB_CLOSE_ON_TAB_LEFT:
rect = wx.Rect(tab_x + 4,
drawn_tab_yoff + (drawn_tab_height / 2) - (bmp.GetHeight() / 2) + shift,
drawn_tab_yoff + (drawn_tab_height // 2) - (bmp.GetHeight() // 2) + shift,
close_button_width, tab_height)
else:
rect = wx.Rect(tab_x + tab_width - close_button_width - 3,
drawn_tab_yoff + (drawn_tab_height / 2) - (bmp.GetHeight() / 2) + shift,
drawn_tab_yoff + (drawn_tab_height // 2) - (bmp.GetHeight() // 2) + shift,
close_button_width, tab_height)
# Indent the button if it is pressed down:
@@ -1988,7 +1988,7 @@ class FF2TabArt(AuiDefaultTabArt):
# draw bitmap
dc.DrawBitmap(pagebitmap, bitmap_offset,
drawn_tab_yoff + (drawn_tab_height/2) - (pagebitmap.GetHeight()/2) + shift,
drawn_tab_yoff + (drawn_tab_height//2) - (pagebitmap.GetHeight()//2) + shift,
True)
text_offset = bitmap_offset + pagebitmap.GetWidth()
@@ -2016,7 +2016,7 @@ class FF2TabArt(AuiDefaultTabArt):
else:
draw_text = ChopText(dc, caption, tab_width - (text_offset-tab_x) - close_button_width)
ypos = drawn_tab_yoff + drawn_tab_height/2 - texty/2 - 1 + shift
ypos = drawn_tab_yoff + drawn_tab_height//2 - texty//2 - 1 + shift
offset_focus = text_offset
@@ -2058,11 +2058,11 @@ class FF2TabArt(AuiDefaultTabArt):
if agwFlags & AUI_NB_CLOSE_ON_TAB_LEFT:
rect = wx.Rect(tab_x + 5,
drawn_tab_yoff + (drawn_tab_height / 2) - (bmp.GetHeight() / 2) + shift,
drawn_tab_yoff + (drawn_tab_height // 2) - (bmp.GetHeight() // 2) + shift,
close_button_width, tab_height)
else:
rect = wx.Rect(tab_x + tab_width - close_button_width - 3,
drawn_tab_yoff + (drawn_tab_height / 2) - (bmp.GetHeight() / 2) + shift,
drawn_tab_yoff + (drawn_tab_height // 2) - (bmp.GetHeight() // 2) + shift,
close_button_width, tab_height)
# Indent the button if it is pressed down:
@@ -2093,14 +2093,14 @@ class FF2TabArt(AuiDefaultTabArt):
if focus:
if upperTabs:
leftPt = wx.Point(rect.x, rect.y + (rect.height / 10)*8)
rightPt = wx.Point(rect.x + rect.width - 2, rect.y + (rect.height / 10)*8)
leftPt = wx.Point(rect.x, rect.y + (rect.height // 10)*8)
rightPt = wx.Point(rect.x + rect.width - 2, rect.y + (rect.height // 10)*8)
else:
leftPt = wx.Point(rect.x, rect.y + (rect.height / 10)*5)
rightPt = wx.Point(rect.x + rect.width - 2, rect.y + (rect.height / 10)*5)
leftPt = wx.Point(rect.x, rect.y + (rect.height // 10)*5)
rightPt = wx.Point(rect.x + rect.width - 2, rect.y + (rect.height // 10)*5)
else:
leftPt = wx.Point(rect.x, rect.y + (rect.height / 2))
rightPt = wx.Point(rect.x + rect.width - 2, rect.y + (rect.height / 2))
leftPt = wx.Point(rect.x, rect.y + (rect.height // 2))
rightPt = wx.Point(rect.x + rect.width - 2, rect.y + (rect.height // 2))
# Define the top region
top = wx.Rect(rect.GetTopLeft(), rightPt)
@@ -2324,7 +2324,7 @@ class VC8TabArt(AuiDefaultTabArt):
# draw bitmap
dc.DrawBitmap(pagebitmap, bitmap_offset,
drawn_tab_yoff + (drawn_tab_height/2) - (pagebitmap.GetHeight()/2) + shift,
drawn_tab_yoff + (drawn_tab_height//2) - (pagebitmap.GetHeight()//2) + shift,
True)
text_offset = bitmap_offset + pagebitmap.GetWidth()
@@ -2351,7 +2351,7 @@ class VC8TabArt(AuiDefaultTabArt):
else:
draw_text = ChopText(dc, caption, tab_width - (text_offset-tab_x) - close_button_width)
ypos = drawn_tab_yoff + drawn_tab_height/2 - texty/2 - 1 + shift
ypos = drawn_tab_yoff + drawn_tab_height//2 - texty//2 - 1 + shift
offset_focus = text_offset
@@ -2398,11 +2398,11 @@ class VC8TabArt(AuiDefaultTabArt):
if agwFlags & AUI_NB_CLOSE_ON_TAB_LEFT:
rect = wx.Rect(tab_x + 20,
drawn_tab_yoff + (drawn_tab_height / 2) - (bmp.GetHeight() / 2) + shift,
drawn_tab_yoff + (drawn_tab_height // 2) - (bmp.GetHeight() // 2) + shift,
close_button_width, tab_height)
else:
rect = wx.Rect(xpos,
drawn_tab_yoff + (drawn_tab_height / 2) - (bmp.GetHeight() / 2) + shift,
drawn_tab_yoff + (drawn_tab_height // 2) - (bmp.GetHeight() // 2) + shift,
close_button_width, tab_height)
# Indent the button if it is pressed down:
@@ -2686,7 +2686,7 @@ class ChromeTabArt(AuiDefaultTabArt):
# draw bitmap
dc.DrawBitmap(pagebitmap, bitmap_offset,
drawn_tab_yoff + (drawn_tab_height/2) - (pagebitmap.GetHeight()/2),
drawn_tab_yoff + (drawn_tab_height//2) - (pagebitmap.GetHeight()//2),
True)
text_offset = bitmap_offset + pagebitmap.GetWidth()
@@ -2714,7 +2714,7 @@ class ChromeTabArt(AuiDefaultTabArt):
else:
draw_text = ChopText(dc, caption, tab_width - (text_offset-tab_x) - close_button_width - leftw)
ypos = drawn_tab_yoff + drawn_tab_height/2 - texty/2 - 1
ypos = drawn_tab_yoff + drawn_tab_height//2 - texty//2 - 1
if control:
if control.GetPosition() != wx.Point(text_offset+1, ypos):
@@ -2748,11 +2748,11 @@ class ChromeTabArt(AuiDefaultTabArt):
if agwFlags & AUI_NB_CLOSE_ON_TAB_LEFT:
rect = wx.Rect(tab_x + leftw - 2,
drawn_tab_yoff + (drawn_tab_height / 2) - (bmp.GetHeight() / 2) + 1,
drawn_tab_yoff + (drawn_tab_height // 2) - (bmp.GetHeight() // 2) + 1,
close_button_width, tab_height)
else:
rect = wx.Rect(tab_x + tab_width - close_button_width - rightw + 2,
drawn_tab_yoff + (drawn_tab_height / 2) - (bmp.GetHeight() / 2) + 1,
drawn_tab_yoff + (drawn_tab_height // 2) - (bmp.GetHeight() // 2) + 1,
close_button_width, tab_height)
if agwFlags & AUI_NB_BOTTOM: