From bc8c70fa9cbd2d7de44757bccf959e3e2a6bd02b Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 6 Aug 2019 15:38:52 +0300 Subject: [PATCH] Add lightness icons --- graphs/gui/stylePickers.py | 10 +++++----- imgs/gui/lightness_bright.png | Bin 0 -> 2728 bytes imgs/gui/lightness_dark.png | Bin 0 -> 2650 bytes imgs/gui/lightness_normal.png | Bin 0 -> 2787 bytes 4 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 imgs/gui/lightness_bright.png create mode 100644 imgs/gui/lightness_dark.png create mode 100644 imgs/gui/lightness_normal.png 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 0000000000000000000000000000000000000000..7ac6122dfa01583f2ee16b6672b0b4ce4dc7990a GIT binary patch literal 2728 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 IM6N<$f}+eAzW@LL literal 0 HcmV?d00001 diff --git a/imgs/gui/lightness_normal.png b/imgs/gui/lightness_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..6892feabd029e6d972b3af08db0f7339a6452b19 GIT binary patch literal 2787 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 literal 0 HcmV?d00001