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

Use a generic button on OSX

Browse Source
This commit is contained in:
Robin Dunn
2017-06-07 20:35:24 -07:00
parent d155247345
commit 51c6cea7b9
1 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
wx/lib/imagebrowser.py
View File

@@ -76,9 +76,32 @@ A simple usage would be::
"""
import os
import sys
import wx
if 'wxOSX' in wx.PlatformInfo:
# The wx.BitmapButton doesn't do so well on OSX with very small bitmaps,
# so use a custom class there.
import wx.lib.buttons
class BitmapButton(wx.lib.buttons.GenBitmapButton):
def __init__(self, *args, **kw):
style = kw.get('style', 0)
style |= wx.BU_EXACTFIT
kw['style'] = style
super(BitmapButton, self).__init__(*args, **kw)
self.SetBezelWidth(1)
self.SetInitialSize()
print(self.GetSize(), self.GetBestSize())
else:
class BitmapButton(wx.BitmapButton):
def __init__(self, *args, **kw):
style = kw.get('style', 0)
style |= wx.BU_EXACTFIT
kw['style'] = style
super(BitmapButton, self).__init__(*args, **kw)
_ = wx.GetTranslation
#---------------------------------------------------------------------------
@@ -117,20 +140,25 @@ def ConvertBMP(file_nm):
return BAD_IMAGE
def GetCheckeredBitmap(blocksize=8, ntiles=4, rgb0='\xFF', rgb1='\xCC'):
def GetCheckeredBitmap(blocksize=8, ntiles=4, rgb0=b'\xFF', rgb1=b'\xCC'):
"""
Creates a square RGB checkered bitmap using the two specified colors.
The bitmap returned will have width = height = blocksize*ntiles*2
:param int `blocksize`: the number of pixels in each solid color square
:param int `ntiles1`: the number of tiles along width and height. Each tile is 2x2 blocks.
:param `rbg0`: the first color, as 3-byte strings.
:param `rgb1`: the second color, as 3-byte strings. If only 1 byte is provided, it is treated as a grey value.
:param int `ntiles1`: the number of tiles along width and height. Each
tile is 2x2 blocks.
:param `rbg0`: the first color, as 3-character bytes object.
:param `rgb1`: the second color, as 3-character bytes object. If only 1
character is provided, it is treated as a grey value.
:return: :class:`wx.BitmapFromBuffer`
:return: :class:`wx.Bitmap`
"""
assert isinstance(rgb0, bytes)
assert isinstance(rgb1, bytes)
size = blocksize*ntiles*2
if len(rgb0)==1:
@@ -219,7 +247,7 @@ class ImageView(wx.Window):
else:
if self.check_bmp is None:
self.check_bmp = GetCheckeredBitmap()
self.check_dim_bmp = GetCheckeredBitmap(rgb0='\x7F', rgb1='\x66')
self.check_dim_bmp = GetCheckeredBitmap(rgb0=b'\x7F', rgb1=b'\x66')
if border == ID_CROP_FRAME:
self.dark_bg = self.check_dim_bmp
self.lite_bg = self.check_bmp
@@ -360,46 +388,46 @@ class ImagePanel(wx.Panel):
vbox.Add(hbox_ctrls, 0, wx.ALIGN_RIGHT|wx.TOP, 4)
bmp = GetNamedBitmap('White')
btn = wx.BitmapButton(self, ID_WHITE_BG, bmp, style=wx.BU_EXACTFIT)
btn = BitmapButton(self, ID_WHITE_BG, bmp)
self.Bind(wx.EVT_BUTTON, self.OnSetImgBackground, btn)
btn.SetToolTip(_("Set background to white"))
hbox_ctrls.Add(btn, 0, wx.ALIGN_LEFT|wx.LEFT, 4)
bmp = GetNamedBitmap('Grey')
btn = wx.BitmapButton(self, ID_GREY_BG, bmp, style=wx.BU_EXACTFIT)
btn = BitmapButton(self, ID_GREY_BG, bmp)
self.Bind(wx.EVT_BUTTON, self.OnSetImgBackground, btn)
btn.SetToolTip(_("Set background to grey"))
hbox_ctrls.Add(btn, 0, wx.ALIGN_LEFT|wx.LEFT, 4)
bmp = GetNamedBitmap('Black')
btn = wx.BitmapButton(self, ID_BLACK_BG, bmp, style=wx.BU_EXACTFIT)
btn = BitmapButton(self, ID_BLACK_BG, bmp)
self.Bind(wx.EVT_BUTTON, self.OnSetImgBackground, btn)
btn.SetToolTip(_("Set background to black"))
hbox_ctrls.Add(btn, 0, wx.ALIGN_LEFT|wx.LEFT, 4)
bmp = GetNamedBitmap('Checked')
btn = wx.BitmapButton(self, ID_CHECK_BG, bmp, style=wx.BU_EXACTFIT)
btn = BitmapButton(self, ID_CHECK_BG, bmp)
self.Bind(wx.EVT_BUTTON, self.OnSetImgBackground, btn)
btn.SetToolTip(_("Set background to chekered pattern"))
btn.SetToolTip(_("Set background to checkered pattern"))
hbox_ctrls.Add(btn, 0, wx.ALIGN_LEFT|wx.LEFT, 4)
hbox_ctrls.AddSpacer(7)
bmp = GetNamedBitmap('NoFrame')
btn = wx.BitmapButton(self, ID_NO_FRAME, bmp, style=wx.BU_EXACTFIT)
btn = BitmapButton(self, ID_NO_FRAME, bmp)
self.Bind(wx.EVT_BUTTON, self.OnSetBorderMode, btn)
btn.SetToolTip(_("No framing around image"))
hbox_ctrls.Add(btn, 0, wx.ALIGN_LEFT|wx.LEFT, 4)
bmp = GetNamedBitmap('BoxFrame')
btn = wx.BitmapButton(self, ID_BOX_FRAME, bmp, style=wx.BU_EXACTFIT)
btn = BitmapButton(self, ID_BOX_FRAME, bmp)
self.Bind(wx.EVT_BUTTON, self.OnSetBorderMode, btn)
btn.SetToolTip(_("Frame image with a box"))
hbox_ctrls.Add(btn, 0, wx.ALIGN_LEFT|wx.LEFT, 4)
bmp = GetNamedBitmap('CropFrame')
btn = wx.BitmapButton(self, ID_CROP_FRAME, bmp, style=wx.BU_EXACTFIT|wx.BORDER_SIMPLE)
btn = BitmapButton(self, ID_CROP_FRAME, bmp)
self.Bind(wx.EVT_BUTTON, self.OnSetBorderMode, btn)
btn.SetToolTip(_("Frame image with a dimmed background"))
hbox_ctrls.Add(btn, 0, wx.ALIGN_LEFT|wx.LEFT, 4)
@@ -462,14 +490,14 @@ class ImageDialog(wx.Dialog):
hbox_loc.Add(self.dir, 1, wx.GROW|wx.ALIGN_LEFT|wx.ALL, 5)
up_bmp = wx.ArtProvider.GetBitmap(wx.ART_GO_DIR_UP, wx.ART_BUTTON, (16,16))
btn = wx.BitmapButton(self, -1, up_bmp)
btn = BitmapButton(self, -1, up_bmp)
btn.SetHelpText(_("Up one level"))
btn.SetToolTip(_("Up one level"))
self.Bind(wx.EVT_BUTTON, self.OnUpDirectory, btn)
hbox_loc.Add(btn, 0, wx.ALIGN_CENTER_VERTICAL|wx.RIGHT, 2)
folder_bmp = wx.ArtProvider.GetBitmap(wx.ART_FOLDER_OPEN, wx.ART_BUTTON, (16,16))
btn = wx.BitmapButton(self, -1, folder_bmp)
btn = BitmapButton(self, -1, folder_bmp)
btn.SetHelpText(_("Browse for a &folder..."))
btn.SetToolTip(_("Browse for a folder..."))
self.Bind(wx.EVT_BUTTON, self.OnChooseDirectory, btn)