diff --git a/graphs/gui/stylePickers.py b/graphs/gui/stylePickers.py index d01291fd9..92ae5a8f3 100644 --- a/graphs/gui/stylePickers.py +++ b/graphs/gui/stylePickers.py @@ -28,14 +28,13 @@ from gui.bitmap_loader import BitmapLoader class ColorPickerPopup(wx.PopupTransientWindow): def __init__(self, parent, wrapper, ncol=0, nrow=0): - super().__init__(parent, flags=wx.BORDER_STATIC) + super().__init__(parent, flags=wx.BORDER_SIMPLE) self.wrapper = wrapper ncol = ncol or len(BASE_COLORS) nrow = nrow or int(len(BASE_COLORS) / ncol) + (1 if (len(BASE_COLORS) % ncol) else 0) - self.SetBackgroundColour(wx.Colour(255, 255, 255)) + self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)) sizer = wx.BoxSizer(wx.VERTICAL) - self.SetSizer(sizer) grid = wx.GridSizer(nrow, ncol, 0, 0) self.patches = list() @@ -45,9 +44,10 @@ class ColorPickerPopup(wx.PopupTransientWindow): icon.SetToolTip(colorData.name) icon.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown) grid.Add(icon, flag=wx.ALL, border=3) - sizer.Add(grid) - sizer.Fit(self) + + self.SetSizer(sizer) + self.Fit() self.Layout() def OnLeftDown(self, event): diff --git a/imgs/gui/lightness_bright.png b/imgs/gui/lightness_bright.png new file mode 100644 index 000000000..7ac6122df Binary files /dev/null and b/imgs/gui/lightness_bright.png differ diff --git a/imgs/gui/lightness_dark.png b/imgs/gui/lightness_dark.png new file mode 100644 index 000000000..014324c28 Binary files /dev/null and b/imgs/gui/lightness_dark.png differ diff --git a/imgs/gui/lightness_normal.png b/imgs/gui/lightness_normal.png new file mode 100644 index 000000000..6892feabd Binary files /dev/null and b/imgs/gui/lightness_normal.png differ