From 62ccb09cacc4c127572864b28cb9187519fba828 Mon Sep 17 00:00:00 2001 From: Rafael Laguna Date: Thu, 17 Jul 2014 14:13:27 +0200 Subject: [PATCH] fix weird transparent panel in mate --- .../gtk-2.0/apps/lubuntu_lxpanel.rc | 6 +- .../gtk-2.0/apps/mate-panel.rc | 204 ------------------ .../themes/Lubuntu-default/gtk-2.0/gtkrc | 1 - 3 files changed, 3 insertions(+), 208 deletions(-) delete mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/apps/mate-panel.rc diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_lxpanel.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_lxpanel.rc index 36e0854..f754140 100644 --- a/usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_lxpanel.rc +++ b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_lxpanel.rc @@ -2,7 +2,7 @@ style "theme-panel" { xthickness = 4 ythickness = 0 - bg_pixmap[NORMAL] = "images/panel-bg.png" + bg_pixmap[NORMAL] = "../images/panel-bg.png" fg[NORMAL] = "#000000" fg[PRELIGHT] = "#ffffff" @@ -64,8 +64,8 @@ style "theme-panel-light" style "theme-panel-text" { - fg[NORMAL] = "#f5f5f5" - fg[PRELIGHT] = "#ffffff" + fg[NORMAL] = "#000000" + fg[PRELIGHT] = "#333333" fg[ACTIVE] = "#f5f5f5" text[NORMAL] = "#f5f5f5" text[PRELIGHT] = "#ffffff" diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/apps/mate-panel.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/mate-panel.rc deleted file mode 100644 index 3b23b38..0000000 --- a/usr/share/themes/Lubuntu-default/gtk-2.0/apps/mate-panel.rc +++ /dev/null @@ -1,204 +0,0 @@ -style "theme-panel" -{ - xthickness = 4 # The spacing (padding) inside and between applets. Add a lower value for a more compact look. - ythickness = 0 - -# Disable (comment out) for normal panel backgrounds or to get a transparancy panel. - #bg_pixmap[NORMAL] = "../images/panel-bg.png" - - base[NORMAL] = @bg_color - base[PRELIGHT] = shade (1.06, @bg_color) - base[INSENSITIVE] = @bg_color - bg[NORMAL] = @bg_color - bg[PRELIGHT] = shade (1.20, @bg_color) - bg[SELECTED] = shade (0.90, @selected_bg_color) - bg[INSENSITIVE] = @bg_color_dark - bg[ACTIVE] = shade (0.8, @bg_color) - fg[NORMAL] = "#000000" - fg[PRELIGHT] = "#000000" - fg[SELECTED] = @selected_fg_color - fg[ACTIVE] = "#ffffff" - fg[INSENSITIVE] = "#f0f0f0" - text[NORMAL] = "#000000" - text[PRELIGHT] = "#000000" - text[ACTIVE] = "#ffffff" - text[SELECTED] = @selected_fg_color - text[INSENSITIVE] = "#f0f0f0" - - engine "murrine" { - } -} - -style "theme-panel-buttons" -{ -# Disable (comment out) for normal panel backgrounds or to get a transparancy panel. - #bg_pixmap[NORMAL] = "../images/panel-bg.png" - - engine "pixmap" { - image { - function = BOX - recolorable = TRUE - state = NORMAL - } - image { - function = BOX - recolorable = TRUE - state = PRELIGHT - file = "../images/panel-button-hover.png" - border = { 4, 4, 1, 1 } - stretch = TRUE - } - image { - function = BOX - recolorable = TRUE - state = ACTIVE - file = "../images/panel-button-active.png" - border = { 4, 4, 1, 1 } - stretch = TRUE - } - image { - function = BOX - recolorable = TRUE - state = SELECTED - file = "../images/panel-button-active.png" - border = { 4, 4, 1, 1 } - stretch = TRUE - } - image { - function = BOX - recolorable = TRUE - state = INSENSITIVE - } - image { - function = ARROW - recolorable = TRUE - arrow_direction = DOWN - } - } -} - -style "theme-panel-light" -{ - xthickness = 1 - ythickness = 0 - - fg[NORMAL] = @fg_color - - engine "murrine" { - textstyle = 0 - roundness = 0 - } -} - -style "theme-panel-text" -{ - fg[NORMAL] = "#000000" - fg[PRELIGHT] = "#000000" - fg[ACTIVE] = "#ffffff" - text[NORMAL] = "#000000" - text[PRELIGHT] = "#000000" - text[ACTIVE] = "#ffffff" -} - -style "theme-main-menu-text" = "theme-panel-text" -{ - fg[PRELIGHT] = "#ffffff" - text[PRELIGHT] = "#ffffff" -} - -style "theme-panel-handle" -{ - engine "pixmap" { - image { - function = HANDLE - } - image { - function = HANDLE - } - } -} - -widget "*PanelWidget*" style "theme-panel" -widget "*PanelApplet*" style "theme-panel" -widget "*fast-user-switch*" style "theme-panel" -widget "*CPUFreq*Applet*" style "theme-panel" -widget "*indicator-applet*" style "theme-panel" -class "PanelApp*" style "theme-panel" -class "PanelToplevel*" style "theme-panel" -widget_class "*PanelToplevel*" style "theme-panel" -widget_class "*PanelFrame*" style "theme-panel" -widget_class "*PanelAppletFrame*" style "theme-panel" -widget_class "*PanelWidget*.*" style "theme-panel" -#widget_class "*notif*" style "theme-panel" -#widget_class "*Notif*" style "theme-panel" -widget_class "*Tray*" style "theme-panel" -widget_class "*tray*" style "theme-panel" -widget_class "*computertemp*" style "theme-panel" -widget_class "*Applet*Tomboy*" style "theme-panel" -widget_class "*Applet*Netstatus*" style "theme-panel" - -# Fixes for tooltip text in some apps. -widget_class "*Notif*Beagle*" style "theme-panel-light" -widget_class "*Notif*Brasero*" style "theme-panel-light" - -# XFCE panel theming. -widget "*Xfce*Panel*" style "theme-panel" -class "*Xfce*Panel*" style "theme-panel" - -# Panel buttons -widget_class "*Panel*GtkToggleButton" style:highest "theme-panel-buttons" -#widget_class "*Panel*GtkButton" style:highest "theme-panel-buttons" - -# XFCE panel buttons -widget "*Xfce*Panel*Button*" style:highest "theme-panel-buttons" -class "*Xfce*Panel*Button*" style:highest "theme-panel-buttons" -widget_class "*LauncherPlugin*" style:highest "theme-panel-buttons" -widget_class "*ActionsPlugin*" style:highest "theme-panel-buttons" - -# lxpanel and fbpanel -+widget "*.tclock.*" style "theme-panel-buttons" -+widget "*.taskbar.*" style "theme-panel-buttons" -+widget_class "*GtkBgbox*" style "theme-panel-buttons" - -# Make sure panel text color doesn't change -widget_class "*Panel*MenuBar*" style "theme-main-menu-text" -widget_class "*Panel**" style "theme-main-menu-text" -widget "*.clock-applet-button.*" style "theme-panel-text" -widget "*PanelApplet*" style "theme-panel-text" - -# Hide ugly handle -class "PanelAppletFrame" style:highest "theme-panel-handle" - -# The following removes the arrows from the panel - -style "panel-arrow-remove" { -engine "pixmap" { - image { - function = ARROW - recolorable = TRUE - overlay_file = "Panel/arrow-blank.png" - overlay_border = {2,2,2,2} - overlay_stretch = FALSE - arrow_direction = UP - } - image { - function = ARROW - recolorable = TRUE - overlay_file = "Panel/arrow-blank.png" - overlay_border = {2,2,2,2} - overlay_stretch = FALSE - arrow_direction = DOWN - } - } -} - -widget_class "*PanelToplevel*" style "panel-arrow-remove" - -# Fix xfce-notifyd button -style "xfce-notifyd-button" { - fg[NORMAL] = @text_color - fg[PRELIGHT] = @text_color - fg[ACTIVE] = @text_color -} - -widget_class "XfceNotifyWindow.*.GtkButton*" style "xfce-notifyd-button" diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc b/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc index 45d0046..d875311 100644 --- a/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc +++ b/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc @@ -684,4 +684,3 @@ include "apps/thunar.rc" # MATE specific include "apps/mate-caja.rc" -include "apps/mate-panel.rc"