From 5670fde8ce33b33d37622b888278aa9cdbe5eea2 Mon Sep 17 00:00:00 2001
From: EMH-Mark-I <EMH_Mark_I@protonmail.com>
Date: Thu, 8 Jun 2023 15:22:37 -0500
Subject: [PATCH] Chicago95 patch fixes This patch addresses the following
 issues with some exceptions. #289 #284 #280 Updated the README.md to include
 the xfce4-panel-profiles as a required package. Made a correction in the
 INSTALL.md doc for copying the Helvetica font. Updated the Whisker menu panel
 plugin button to use the Helvetica font if it's installed. Cosmetic updates
 to the XFCE panel systray, terminal, and GTK filechooser.

---
 INSTALL.md                                   |  4 ++--
 README.md                                    |  1 +
 Theme/Chicago95/gtk-3.0/apps/filechooser.css |  4 ++++
 Theme/Chicago95/gtk-3.0/apps/whiskermenu.css |  2 +-
 Theme/Chicago95/gtk-3.0/apps/xfce.css        | 12 ++++++++----
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index b22a65b..adb2051 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -485,9 +485,9 @@ For an authentic Windows 95 feel, you can use the included cronyx-cyrillic Helve
 #### Helvetica install
 To install the Helvetica font, you'll need to copy the "cronyx-cyrillic" folder from the `Fonts/` directory into either `~/.fonts` for only a user install or `/usr/share/fonts` for a system-wide install.
 
-    cp -r Chicago95-master/Fonts/cronyx-cyrillic ~/.fonts
+    cp -r Chicago95-master/Fonts/bitmap/cronyx-cyrillic ~/.fonts
 
-    cp -r Chicago95-master/Fonts/cronyx-cyrillic /usr/share/fonts
+    cp -r Chicago95-master/Fonts//bitmap/cronyx-cyrillic /usr/share/fonts
 
 By default, some systems block bitmap fonts. To enable this and other bitmap fonts, run the following command:
 
diff --git a/README.md b/README.md
index c70270a..fb73e02 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ I was unhappy with the various XFCE/GTK2/GTK3 Windows 95 based themes and decide
 - GTK+ 3.22 or 3.24
 - Xfce 4.12, 4.14, 4.16
 - gtk2-engines-pixbuf (Recommended for GTK2 applications)
+- The xfce4-panel-profiles package
 - A Window compositor
 
 (If your are using an older desktop that uses GTK3.18, you can use [this forked version of the theme.](https://github.com/EMH-Mark-I/Chicago95-Custom-XUbuntu-16.04-))
diff --git a/Theme/Chicago95/gtk-3.0/apps/filechooser.css b/Theme/Chicago95/gtk-3.0/apps/filechooser.css
index e19cbd7..53e8d0a 100644
--- a/Theme/Chicago95/gtk-3.0/apps/filechooser.css
+++ b/Theme/Chicago95/gtk-3.0/apps/filechooser.css
@@ -53,3 +53,7 @@ filechooser revealer > box > stack {
     filechooser revealer > box > stack button label {
       padding-left: 0px;
       padding-right: 0px; }*/
+filechooser scrolledwindow {
+  border: 2px solid @border_dark;
+  border-image: url("../assets/frame_inset.png");
+  border-image-slice: 2 2 2 2; }
diff --git a/Theme/Chicago95/gtk-3.0/apps/whiskermenu.css b/Theme/Chicago95/gtk-3.0/apps/whiskermenu.css
index d646b6b..6d95d9d 100644
--- a/Theme/Chicago95/gtk-3.0/apps/whiskermenu.css
+++ b/Theme/Chicago95/gtk-3.0/apps/whiskermenu.css
@@ -39,7 +39,7 @@ the whisker menu without having to correct their pointer location. */
     padding: 1px;
     border: none;
     color: black;
-    font-family: "Microsoft Sans Serif", Sans, Sans-Serif;
+    font-family: Helvetica, "Microsoft Sans Serif", Sans, Sans-Serif;
     font-weight: bold; }
 
 /****************
diff --git a/Theme/Chicago95/gtk-3.0/apps/xfce.css b/Theme/Chicago95/gtk-3.0/apps/xfce.css
index 11071a7..97c4086 100644
--- a/Theme/Chicago95/gtk-3.0/apps/xfce.css
+++ b/Theme/Chicago95/gtk-3.0/apps/xfce.css
@@ -121,8 +121,8 @@ wnck-pager {
   border: none;
   box-shadow: none;
   margin: 0px;
-/*  background-color: @bg_color; } */
-  background-color: transparent; }
+  background-color: @bg_color; }
+/*  background-color: transparent; } */
 /* Tasklist */
 .tasklist .toggle {
   /* We remove borders and shadows for the '.tasklist' '.toggle' button 
@@ -232,15 +232,19 @@ wnck-pager {
 
 /* XFCE terminal */
 #xfce4-terminal-notebook overlay > box,
-#xfce4-terminal-notebook stack > box {
+#xfce4-terminal-notebook stack > box,
+#xfce4-terminal-notebook stack scrolledwindow {
   border: 2px solid @border_dark;
   border-image: url("../assets/frame_inset.png");
   border-image-slice: 2 2 2 2;
   box-shadow: none; }
   .fullscreen #xfce4-terminal-notebook overlay > box,
   .fullscreen #xfce4-terminal-notebook stack > box,
+  .fullscreen #xfce4-terminal-notebook stack scrolledwindow,
   .maximized #xfce4-terminal-notebook overlay > box,
-  .maximized #xfce4-terminal-notebook stack > box {
+  .maximized #xfce4-terminal-notebook stack > box,
+  .maximized #xfce4-terminal-notebook stack scrolledwindow {
+    margin: 0px;
     border: none;
     border-image: none;
     box-shadow: none; }