From f82d4a4b984f543cdb4003dc7647cd79efd67fa8 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Wed, 18 May 2022 23:59:57 +0300 Subject: [PATCH] - fixed the `Toggle Grid Lines` functionality for dark mode --- CHANGELOG.md | 1 + appGUI/PlotCanvas.py | 12 ++++++------ appGUI/PlotCanvasLegacy.py | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef307e1c..e5b81354 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ CHANGELOG for FlatCAM Evo beta 18.05.2022 - added some safeguards in Cutout Plugin +- fixed the `Toggle Grid Lines` functionality for dark mode 17.05.2020 diff --git a/appGUI/PlotCanvas.py b/appGUI/PlotCanvas.py index 0d40cf9f..717b7d3c 100644 --- a/appGUI/PlotCanvas.py +++ b/appGUI/PlotCanvas.py @@ -383,7 +383,7 @@ class PlotCanvas(QtCore.QObject, VisPyCanvas): self.rect_hud.radius = [5, 5, 5, 5] def on_toggle_grid_lines(self, signal=None, silent=None): - state = not self.grid_lines_enabled + state = self.grid_lines_enabled settings = QtCore.QSettings("Open Source", "FlatCAM") if settings.contains("theme"): @@ -399,18 +399,18 @@ class PlotCanvas(QtCore.QObject, VisPyCanvas): if (theme == 'default' or theme == 'light') and not dark_canvas: color = 'dimgray' else: - color = '#dededeff' + color = '#202124ff' if state: - self.fcapp.defaults['global_grid_lines'] = True - self.grid_lines_enabled = True + self.fcapp.options['global_grid_lines'] = True + self.grid_lines_enabled = False # self.grid.parent = self.view.scene self.grid._grid_color_fn['color'] = Color(color).rgba if silent is None: self.fcapp.inform[str, bool].emit(_("Grid enabled."), False) else: - self.fcapp.defaults['global_grid_lines'] = False - self.grid_lines_enabled = False + self.fcapp.options['global_grid_lines'] = False + self.grid_lines_enabled = True # self.grid.parent = None self.grid._grid_color_fn['color'] = Color('#FFFFFFFF').rgba if silent is None: diff --git a/appGUI/PlotCanvasLegacy.py b/appGUI/PlotCanvasLegacy.py index 56f14be2..706f1fb3 100644 --- a/appGUI/PlotCanvasLegacy.py +++ b/appGUI/PlotCanvasLegacy.py @@ -534,11 +534,11 @@ class PlotCanvasLegacy(QtCore.QObject): self.text = hud_text def on_toggle_grid_lines(self, signal=None, silent=None): - state = not self.grid_lines_enabled + state = self.grid_lines_enabled if state: self.app.options['global_grid_lines'] = True - self.grid_lines_enabled = True + self.grid_lines_enabled = False self.axes.grid(True) try: self.canvas.draw() @@ -548,7 +548,7 @@ class PlotCanvasLegacy(QtCore.QObject): self.app.inform[str, bool].emit(_("Grid enabled."), False) else: self.app.options['global_grid_lines'] = False - self.grid_lines_enabled = False + self.grid_lines_enabled = True self.axes.grid(False) try: self.canvas.draw()