From 998d63d6680379c71e704d87446f308b97b42dba Mon Sep 17 00:00:00 2001
From: Eric Larson <larson.eric.d@gmail.com>
Date: Fri, 8 Apr 2022 08:32:31 -0400
Subject: [PATCH] FIX: Better separators

---
 mne/icons/toolbar_move_horizontal@2x.png      | Bin 0 -> 304 bytes
 mne/icons/toolbar_move_vertical@2x.png        | Bin 0 -> 208 bytes
 mne/icons/toolbar_separator_horizontal.png    | Bin 0 -> 151 bytes
 mne/icons/toolbar_separator_horizontal@2x.png | Bin 0 -> 288 bytes
 mne/icons/toolbar_separator_vertical@2x.png   | Bin 0 -> 192 bytes
 mne/viz/backends/_utils.py                    |  24 ++++++++++++++++--
 6 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 mne/icons/toolbar_move_horizontal@2x.png
 create mode 100644 mne/icons/toolbar_move_vertical@2x.png
 create mode 100644 mne/icons/toolbar_separator_horizontal.png
 create mode 100644 mne/icons/toolbar_separator_horizontal@2x.png
 create mode 100644 mne/icons/toolbar_separator_vertical@2x.png

diff --git a/mne/icons/toolbar_move_horizontal@2x.png b/mne/icons/toolbar_move_horizontal@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..143b62ec558059e11306c29ed23f2152062492c0
GIT binary patch
literal 304
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1Fqb
zi(^Q|oVOP?@*XmfV11b0=FvW7W`v@s@J3c+*M*7P!3`@GY?|x*XrI<m{fd1qm+Z9{
z|4)d`Up^&fl8Wi`O1rq~d)uvg{(Mxav`zCe+ADwU^S+Be7|tKB`Sq^!eo8-s{aJ=D
z46_(tFq$x5V9sD$z<z<pfq#KygPemggKa|^Llpyc6x@<yd>6m3`mVX8{DL&klhY>Y
hntFe)_RRXgaMV`D<l*A)`9R+?c)I$ztaD0e0svoaY-a!f

literal 0
HcmV?d00001

diff --git a/mne/icons/toolbar_move_vertical@2x.png b/mne/icons/toolbar_move_vertical@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..453d7b71f96c0c92de92c13b189e391157495a2d
GIT binary patch
literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAP_W6<
z#WAE}&fDvTd`$rYEEgJ`1*C<~JrP}DA!z>5M#b!ibI00;x0Txd$64M?D%<S~)WX29
z!hJLEv!8|DlQlid9p>BWMjC(l`}LpXwxc&Jr~6OxzU6a!gN;M#DdshjlWpqbQ_H>M
xB>VLk8UFC^cQ7nF_f&ZQf$};=ut^MBAK6M?N%2da6?Xy&c)I$ztaD0e0sy$KMVkNs

literal 0
HcmV?d00001

diff --git a/mne/icons/toolbar_separator_horizontal.png b/mne/icons/toolbar_separator_horizontal.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecf2ab7d0cf13b74e90e4f9f263db0f0553c7da3
GIT binary patch
literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DCp_w
z;usRq`u6%pUIqmoW=C#AiDu<g(J4GaZ3eRcYu98ePrP`tYqIFMV_R6(rr!0IdI!{m
j1a?%;pIEg&@y{LBi>jP|B|;wsf+Rg%{an^LB{Ts5m>wzI

literal 0
HcmV?d00001

diff --git a/mne/icons/toolbar_separator_horizontal@2x.png b/mne/icons/toolbar_separator_horizontal@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac2b343264624c5a6ce5842ea5c87a4f45abfb7b
GIT binary patch
literal 288
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1Ftc
zi(^Q|oVOP?@*Z*!aXDz}YT;buyX8Sg*NdiEI+HK7ayqz7sG4x2Q*ZZQ{gtcg%~teJ
ze_D2Gg7>79)0MOO!Z$uvu=AaC{bTZ^kFrb!jPs7ySH1UQ`@zY(fIWlO*yzCD)79a6
p2c}s%U*n0~oSJ66>eYH%1`b`mAkCc52|(X5c)I$ztaD0e0sz%VVf_FA

literal 0
HcmV?d00001

diff --git a/mne/icons/toolbar_separator_vertical@2x.png b/mne/icons/toolbar_separator_vertical@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f66e93d34699edb9b049006704fdfa01db79707
GIT binary patch
literal 192
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAP_W3;
z#WAE}&f5zcIhzwiSRPzfJfil%C-UH_&O0ifIWmtZnymeCUF*nu?f&pPyIFu5fS{u3
zm4wgb?{l@1Cp~MkOP{rQ>HA&R)8(%ny;*NJUnTcd&+!d14-!u?ZsYNs_ImZ4ymPZ2
fz7v9IWjOG)E@~<-$0woawIC5sS3j3^P6<r_VV6ee

literal 0
HcmV?d00001

diff --git a/mne/viz/backends/_utils.py b/mne/viz/backends/_utils.py
index fde9be11ef0..aa1a4f04da9 100644
--- a/mne/viz/backends/_utils.py
+++ b/mne/viz/backends/_utils.py
@@ -9,6 +9,7 @@
 import collections.abc
 from colorsys import rgb_to_hls
 from contextlib import contextmanager
+import functools
 import platform
 import signal
 import sys
@@ -75,6 +76,7 @@ def _alpha_blend_background(ctable, background_color):
     return (use_table * alphas) + background_color * (1 - alphas)
 
 
+@functools.lru_cache
 def _qt_init_icons():
     from qtpy.QtGui import QIcon
     icons_path = f"{Path(__file__).parent.parent.parent}/icons"
@@ -219,7 +221,9 @@ def _qt_get_stylesheet(theme):
                 # https://github.com/ColinDuquesnoy/QDarkStyleSheet/blob/master/qdarkstyle/dark/style.qss  # noqa: E501
                 # Something around rgb(51, 51, 51) worked as the bgcolor here,
                 # but it's easy enough just to set it transparent and inherit
-                # the bgcolor of the window (which is the same)
+                # the bgcolor of the window (which is the same). We also take
+                # the separator images from QDarkStyle (MIT).
+                icons_path = _qt_init_icons()
                 stylesheet = """\
 QStatusBar {
   border: 1px solid rgb(76, 76, 75);
@@ -232,7 +236,23 @@ def _qt_get_stylesheet(theme):
   background-color: transparent;
   border-bottom: 1px solid rgb(99, 99, 99);
 }
-"""
+QToolBar::separator:horizontal {
+  width: 16px;
+  image: url("%(icons_path)s/toolbar_separator_horizontal@2x.png");
+}
+QToolBar::separator:vertical {
+  height: 16px;
+  image: url("%(icons_path)s/toolbar_separator_vertical@2x.png");
+}
+QToolBar::handle:horizontal {
+  width: 16px;
+  image: url("%(icons_path)s/toolbar_move_horizontal@2x.png");
+}
+QToolBar::handle:vertical {
+  height: 16px;
+  image: url("%(icons_path)s/toolbar_move_vertical@2x.png");
+}
+""" % dict(icons_path=icons_path)
             else:
                 stylesheet = ''
         else: