From d1c1f03160d70b4d6f88b26f2a782ed876ec3a38 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Sun, 15 Sep 2002 19:39:10 +0000
Subject: [PATCH] Theme tweaking (bbs) Remove menu button from dialogs.
(Old svn revision: 10570)
---
src/client.c | 6 ++++--
src/frame.c | 2 +-
themes/bbs/bottom-active.xpm | 4 +++-
themes/bbs/bottom-inactive.xpm | 4 +++-
themes/bbs/bottom-left-active.xpm | 13 +++++++------
themes/bbs/bottom-left-inactive.xpm | 13 +++++++------
themes/bbs/bottom-right-active.xpm | 13 +++++++------
themes/bbs/bottom-right-inactive.xpm | 13 +++++++------
8 files changed, 39 insertions(+), 29 deletions(-)
diff --git a/src/client.c b/src/client.c
index 3c8e50430..15ccd8897 100644
--- a/src/client.c
+++ b/src/client.c
@@ -652,6 +652,8 @@ static void clientWindowType(Client * c)
c->type = WINDOW_DIALOG;
layer = WIN_LAYER_ONTOP;
c->has_hide = False;
+ c->has_menu = False;
+ c->has_maximize = False;
}
else if(c->type_atom == net_wm_window_type_normal)
{
@@ -663,18 +665,18 @@ static void clientWindowType(Client * c)
{
DBG("atom net_wm_window_type_utility detected\n");
c->type = WINDOW_UTILITY;
- c->has_border = False;
layer = WIN_LAYER_NORMAL;
+ c->has_border = False;
c->has_hide = False;
}
else if(c->type_atom == net_wm_window_type_splashscreen)
{
DBG("atom net_wm_window_type_splashscreen detected\n");
c->type = WINDOW_SPLASHSCREEN;
+ layer = WIN_LAYER_ABOVE_DOCK;
c->has_border = False;
c->has_resize = False;
c->has_move = False;
- layer = WIN_LAYER_ABOVE_DOCK;
c->has_hide = False;
}
}
diff --git a/src/frame.c b/src/frame.c
index e49088634..c122109a0 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -587,7 +587,7 @@ void frameDraw(Client * c)
x = x + buttons[button][ACTIVE].width + button_spacing;
}
}
- left = x;
+ left = x - button_spacing;
x = frameWidth(c) - frameRight(c) + button_spacing - button_offset;
for(j = strlen(button_layout) - 1; j >= i; j--)
diff --git a/themes/bbs/bottom-active.xpm b/themes/bbs/bottom-active.xpm
index 8d1683b8b..b5e381b5e 100644
--- a/themes/bbs/bottom-active.xpm
+++ b/themes/bbs/bottom-active.xpm
@@ -1,15 +1,17 @@
/* XPM */
static char * bottom_active_xpm[] = {
-"32 7 5 1",
+"32 8 6 1",
" c None",
". c #9B9B8A s active_shadow_2",
"+ c #D6D6CC s active_hilight_2",
"# c #D6D6CC s active_color_2",
+"& c #9B9B8A s active_mid_2",
"@ c #000000",
"................................",
"++++++++++++++++++++++++++++++++",
"################################",
"################################",
"################################",
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&",
"................................",
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/bbs/bottom-inactive.xpm b/themes/bbs/bottom-inactive.xpm
index e73bf7fed..db7ed47a5 100644
--- a/themes/bbs/bottom-inactive.xpm
+++ b/themes/bbs/bottom-inactive.xpm
@@ -1,15 +1,17 @@
/* XPM */
static char * bottom_inactive_xpm[] = {
-"32 7 5 1",
+"32 8 6 1",
" c None",
". c #9B9B8A s inactive_shadow_2",
"+ c #D6D6CC s inactive_hilight_2",
"# c #D6D6CC s inactive_color_2",
+"& c #9B9B8A s inactive_mid_2",
"@ c #000000",
"................................",
"++++++++++++++++++++++++++++++++",
"################################",
"################################",
"################################",
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&",
"................................",
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/bbs/bottom-left-active.xpm b/themes/bbs/bottom-left-active.xpm
index 176b1cda4..010266766 100644
--- a/themes/bbs/bottom-left-active.xpm
+++ b/themes/bbs/bottom-left-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * bottom_left_active_xpm[] = {
-"20 7 6 1",
+"20 8 6 1",
" c None",
". c #000000",
"+ c #FFFFFF s active_hilight_2",
@@ -8,9 +8,10 @@ static char * bottom_left_active_xpm[] = {
"# c #9B9B8A s active_shadow_2",
"& c #9B9B8A s active_mid_2",
".+@#################",
-".++++++++++++++++++@",
-".+&&&&&&&&&&&&&&&&&#",
-".+&&&&&&&&&&&&&&&&&#",
-".+&&&&&&&&&&&&&&&&&#",
-".@##################",
+".+++++++++++++++++@.",
+".+&&&&&&&&&&&&&&&&#.",
+".+&&&&&&&&&&&&&&&&#.",
+".+&&&&&&&&&&&&&&&&#.",
+".+&&&&&&&&&&&&&&&&#.",
+".@#################.",
" ..................."};
diff --git a/themes/bbs/bottom-left-inactive.xpm b/themes/bbs/bottom-left-inactive.xpm
index 2eb6f1c52..ae7686e38 100644
--- a/themes/bbs/bottom-left-inactive.xpm
+++ b/themes/bbs/bottom-left-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * bottom_left_inactive_xpm[] = {
-"20 7 6 1",
+"20 8 6 1",
" c None",
". c #000000",
"+ c #FFFFFF s inactive_hilight_2",
@@ -8,9 +8,10 @@ static char * bottom_left_inactive_xpm[] = {
"# c #9B9B8A s inactive_shadow_2",
"& c #9B9B8A s inactive_mid_2",
".+@#################",
-".++++++++++++++++++@",
-".+&&&&&&&&&&&&&&&&&#",
-".+&&&&&&&&&&&&&&&&&#",
-".+&&&&&&&&&&&&&&&&&#",
-".@##################",
+".+++++++++++++++++@.",
+".+&&&&&&&&&&&&&&&&#.",
+".+&&&&&&&&&&&&&&&&#.",
+".+&&&&&&&&&&&&&&&&#.",
+".+&&&&&&&&&&&&&&&&#.",
+".@#################.",
" ..................."};
diff --git a/themes/bbs/bottom-right-active.xpm b/themes/bbs/bottom-right-active.xpm
index 387a9d549..d87bed0bc 100644
--- a/themes/bbs/bottom-right-active.xpm
+++ b/themes/bbs/bottom-right-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * bottom_right_active_xpm[] = {
-"20 7 6 1",
+"20 8 6 1",
" c None",
". c #9B9B8A s active_shadow_2",
"+ c #D6D6CC s active_color_2",
@@ -8,9 +8,10 @@ static char * bottom_right_active_xpm[] = {
"# c #9B9B8A s active_hilight_2",
"& c #9B9B8A s active_mid_2",
".................+.@",
-"+#################.@",
-".&&&&&&&&&&&&&&&&&.@",
-".&&&&&&&&&&&&&&&&&.@",
-".&&&&&&&&&&&&&&&&&.@",
-"...................@",
+"@################+.@",
+"@#&&&&&&&&&&&&&&&&.@",
+"@#&&&&&&&&&&&&&&&&.@",
+"@#&&&&&&&&&&&&&&&&.@",
+"@#&&&&&&&&&&&&&&&&.@",
+"@+.................@",
"@@@@@@@@@@@@@@@@@@@ "};
diff --git a/themes/bbs/bottom-right-inactive.xpm b/themes/bbs/bottom-right-inactive.xpm
index a9c73d501..a0edb23b5 100644
--- a/themes/bbs/bottom-right-inactive.xpm
+++ b/themes/bbs/bottom-right-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * bottom_right_inactive_xpm[] = {
-"20 7 6 1",
+"20 8 6 1",
" c None",
". c #9B9B8A s inactive_shadow_2",
"+ c #D6D6CC s inactive_color_2",
@@ -8,9 +8,10 @@ static char * bottom_right_inactive_xpm[] = {
"# c #9B9B8A s inactive_hilight_2",
"& c #9B9B8A s inactive_mid_2",
".................+.@",
-"+#################.@",
-".&&&&&&&&&&&&&&&&&.@",
-".&&&&&&&&&&&&&&&&&.@",
-".&&&&&&&&&&&&&&&&&.@",
-"...................@",
+"@################+.@",
+"@#&&&&&&&&&&&&&&&&.@",
+"@#&&&&&&&&&&&&&&&&.@",
+"@#&&&&&&&&&&&&&&&&.@",
+"@#&&&&&&&&&&&&&&&&.@",
+"@+.................@",
"@@@@@@@@@@@@@@@@@@@ "};
--
GitLab