From 32e697e0f233878239a275725c73e4ace583e837 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Fri, 13 Jul 2018 10:52:52 +0200
Subject: highcontrast: Use normal titlebar size for utility windows

The xx-small scale makes title bars really small and harder to read, which
is not really the goal of high contrast themes :)
---
 .../HighContrastInverse/metacity-1/metacity-theme-1.xml | 17 ++---------------
 marco-themes/HighContrast/metacity-theme-1.xml          | 17 ++---------------
 2 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/desktop-themes/HighContrastInverse/metacity-1/metacity-theme-1.xml b/desktop-themes/HighContrastInverse/metacity-1/metacity-theme-1.xml
index 3cc1bb99..9d1f43b2 100644
--- a/desktop-themes/HighContrastInverse/metacity-1/metacity-theme-1.xml
+++ b/desktop-themes/HighContrastInverse/metacity-1/metacity-theme-1.xml
@@ -29,19 +29,6 @@
   <distance name="right_titlebar_edge" value="0"/>
 </frame_geometry>
 
-<frame_geometry name="utility" title_scale="xx-small">
-  <distance name="left_width" value="3"/>
-  <distance name="right_width" value="3"/>
-  <distance name="bottom_height" value="4"/>
-  <distance name="left_titlebar_edge" value="3"/>
-  <distance name="right_titlebar_edge" value="3"/>
-  <distance name="button_width" value="11"/>
-  <distance name="button_height" value="11"/>
-  <distance name="title_vertical_pad" value="1"/>
-  <border name="title_border" left="3" right="4" top="3" bottom="3"/>
-  <border name="button_border" left="0" right="0" top="1" bottom="1"/>
-</frame_geometry>
-
 <frame_geometry name="border" has_title="false">
   <distance name="left_width" value="4"/>
   <distance name="right_width" value="4"/>
@@ -290,11 +277,11 @@
   <button function="maximize" state="pressed" draw_ops="restore_button_pressed"/>
 </frame_style>
 
-<frame_style name="utility_unfocused" geometry="utility" parent="normal_unfocused">
+<frame_style name="utility_unfocused" geometry="normal" parent="normal_unfocused">
   <piece position="title" draw_ops="title_utility"/>
 </frame_style>
 
-<frame_style name="utility_focused" geometry="utility" parent="normal_focused">
+<frame_style name="utility_focused" geometry="normal" parent="normal_focused">
   <piece position="title" draw_ops="title_utility_focused"/>
 </frame_style>
 
diff --git a/marco-themes/HighContrast/metacity-theme-1.xml b/marco-themes/HighContrast/metacity-theme-1.xml
index d1a26cce..127def31 100644
--- a/marco-themes/HighContrast/metacity-theme-1.xml
+++ b/marco-themes/HighContrast/metacity-theme-1.xml
@@ -29,19 +29,6 @@
   <distance name="right_titlebar_edge" value="0"/>
 </frame_geometry>
 
-<frame_geometry name="utility" title_scale="xx-small">
-  <distance name="left_width" value="3"/>
-  <distance name="right_width" value="3"/>
-  <distance name="bottom_height" value="4"/>
-  <distance name="left_titlebar_edge" value="3"/>
-  <distance name="right_titlebar_edge" value="3"/>
-  <distance name="button_width" value="11"/>
-  <distance name="button_height" value="11"/>
-  <distance name="title_vertical_pad" value="1"/>
-  <border name="title_border" left="3" right="4" top="3" bottom="3"/>
-  <border name="button_border" left="0" right="0" top="1" bottom="1"/>
-</frame_geometry>
-
 <frame_geometry name="border" has_title="false">
   <distance name="left_width" value="4"/>
   <distance name="right_width" value="4"/>
@@ -305,11 +292,11 @@
   <button function="maximize" state="pressed" draw_ops="restore_button_pressed"/>
 </frame_style>
 
-<frame_style name="utility_unfocused" geometry="utility" parent="normal_unfocused">
+<frame_style name="utility_unfocused" geometry="normal" parent="normal_unfocused">
   <piece position="title" draw_ops="title_utility"/>
 </frame_style>
 
-<frame_style name="utility_focused" geometry="utility" parent="normal_focused">
+<frame_style name="utility_focused" geometry="normal" parent="normal_focused">
   <piece position="title" draw_ops="title_utility_focused"/>
 </frame_style>
 
-- 
cgit v1.2.1