summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberts Muktupāvels <[email protected]>2016-01-28 17:21:40 +0200
committerVictor Kareh <[email protected]>2018-08-29 12:52:28 -0400
commita6f9462029e7395c778a6aef9e9e1c5b2452bdda (patch)
tree7903cd18dcbb9eececfe35cf7e40d4cc96a1b60e
parentfbae49d4a77217289d460fcc284a19f17079c586 (diff)
downloadmarco-a6f9462029e7395c778a6aef9e9e1c5b2452bdda.tar.bz2
marco-a6f9462029e7395c778a6aef9e9e1c5b2452bdda.tar.xz
theme: revert theme format version 3.6
Shadow and padding was never part of theme. This format was created by mutter, and it is an incompatible change.
-rw-r--r--doc/theme-format.txt6
-rw-r--r--src/ui/theme-parser.c4
2 files changed, 1 insertions, 9 deletions
diff --git a/doc/theme-format.txt b/doc/theme-format.txt
index 80ddd328..ad2d2b74 100644
--- a/doc/theme-format.txt
+++ b/doc/theme-format.txt
@@ -22,12 +22,6 @@ This document has separate sections for each format version. You may
want to read the document in reverse order, since the base features
are discussed under version 1.
-New Features in Theme Format Version 3.6
-========================================
-
-Add new 'invisible_border' border in frame geometry. Used for resize
-cursor area.
-
New Features in Theme Format Version 3.5
========================================
diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c
index 6fadaa1d..a328fd06 100644
--- a/src/ui/theme-parser.c
+++ b/src/ui/theme-parser.c
@@ -38,7 +38,7 @@
* look out for.
*/
#define THEME_MAJOR_VERSION 3
-#define THEME_MINOR_VERSION 6
+#define THEME_MINOR_VERSION 5
#define THEME_VERSION (1000 * THEME_MAJOR_VERSION + THEME_MINOR_VERSION)
#define MARCO_THEME_FILENAME_FORMAT "metacity-theme-%d.xml"
@@ -1570,8 +1570,6 @@ parse_border (GMarkupParseContext *context,
border = &info->layout->title_border;
else if (strcmp (name, "button_border") == 0)
border = &info->layout->button_border;
- else if (strcmp (name, "invisible_border") == 0)
- border = &info->layout->invisible_border;
if (border == NULL)
{