Drop Opacity support.

raveit65 · Apr 24, 2017 · 0e7ed6b · 0e7ed6b
1 parent c5a6adc
commit 0e7ed6b
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 66 deletions.
diff --git a/data/mate-menu-config.glade b/data/mate-menu-config.glade
@@ -578,47 +578,6 @@
                                 <property name="top_attach">0</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkLabel" id="label8">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="label" translatable="yes">Opacity:</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkSpinButton" id="opacity">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="invisible_char">●</property>
-                                <property name="primary_icon_activatable">False</property>
-                                <property name="secondary_icon_activatable">False</property>
-                                <property name="adjustment">adjustment2</property>
-                                <property name="climb_rate">1</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label9">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="margin_left">5</property>
-                                <property name="label" translatable="yes">%</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">2</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>

diff --git a/data/org.mate.mate-menu.gschema.xml b/data/org.mate.mate-menu.gschema.xml
@@ -38,12 +38,6 @@
       <description></description>
     </key>
 
-    <key type="i" name="opacity">
-      <default>100</default>
-      <summary></summary>
-      <description></description>
-    </key>
-
     <key type="i" name="offset">
       <default>0</default>
       <summary></summary>

diff --git a/lib/mate-menu-config.py b/lib/mate-menu-config.py
@@ -70,9 +70,6 @@ def __init__( self ):
         self.builder.get_object("label11").set_text(_("Border width:"))
         self.builder.get_object("label25").set_text(_("pixels"))
 
-        self.builder.get_object("label8").set_text(_("Opacity:"))
-        self.builder.get_object("label9").set_text("%")
-
         self.builder.get_object("buttonTextLabel").set_text(_("Button text:"))
         self.builder.get_object("label1").set_text(_("Options"))
         self.builder.get_object("applicationsLabel").set_text(_("Applications"))
@@ -142,7 +139,6 @@ def __init__( self ):
         self.systemIconSize = self.builder.get_object( "systemIconSize" )
         self.favCols = self.builder.get_object( "numFavCols" )
         self.borderWidth = self.builder.get_object( "borderWidth" )
-        self.opacity = self.builder.get_object( "opacity" )
         self.useCustomColors = self.builder.get_object( "useCustomColors" )
         self.backgroundColor = self.builder.get_object( "backgroundColor" )
         self.borderColor = self.builder.get_object( "borderColor" )
@@ -218,7 +214,6 @@ def __init__( self ):
         self.bindGSettingsValueToWidget( self.settingsSystem, "int", "icon-size", self.systemIconSize, "value-changed", self.systemIconSize.set_value, self.systemIconSize.get_value )
 
         self.bindGSettingsValueToWidget( self.settings, "int", "border-width", self.borderWidth, "value-changed", self.borderWidth.set_value, self.borderWidth.get_value_as_int )
-        self.bindGSettingsValueToWidget( self.settings, "int", "opacity", self.opacity, "value-changed", self.opacity.set_value, self.opacity.get_value_as_int )
         self.bindGSettingsValueToWidget( self.settings, "bool", "use-custom-color", self.useCustomColors, "toggled", self.useCustomColors.set_active, self.useCustomColors.get_active )
         self.bindGSettingsValueToWidget( self.settings, "color", "custom-color", self.backgroundColor, "color-set", self.backgroundColor.set_rgba, self.getBackgroundColor )
         self.bindGSettingsValueToWidget( self.settings, "color", "custom-heading-color", self.headingColor, "color-set", self.headingColor.set_rgba, self.getHeadingColor )

diff --git a/lib/mate-menu.py b/lib/mate-menu.py
@@ -120,7 +120,6 @@ def __init__( self, toggleButton, settings, keybinder ):
         self.settings.connect( "changed::custom-heading-color", self.toggleCustomHeadingColor )
         self.settings.connect( "changed::custom-color", self.toggleCustomBackgroundColor )
         self.settings.connect( "changed::border-width", self.toggleBorderWidth )
-        self.settings.connect( "changed::opacity", self.toggleOpacity )
 
         self.getSetGSettingEntries()
 
@@ -161,10 +160,6 @@ def toggleBorderWidth( self, settings, key,  args = None ):
         self.borderwidth = settings.get_int(key)
         self.SetupMateMenuBorder()
 
-    def toggleOpacity( self, settings, key, args = None ):
-        self.opacity = settings.get_int(key)
-        self.SetupMateMenuOpacity()
-
     def toggleUseCustomColor( self, settings, key, args = None ):
         self.usecustomcolor = settings.get_boolean(key)
         self.loadTheme()
@@ -188,7 +183,6 @@ def getSetGSettingEntries( self ):
         self.customheadingcolor   = self.settings.get_string( "custom-heading-color" )
         self.custombordercolor    = self.settings.get_string( "custom-border-color" )
         self.borderwidth          = self.settings.get_int( "border-width" )
-        self.opacity              = self.settings.get_int( "opacity" )
         self.offset               = self.settings.get_int( "offset" )
         self.enableTooltips       = self.settings.get_boolean( "tooltips-enabled" )
         self.startWithFavorites   = self.settings.get_boolean( "start-with-favorites" )
@@ -205,13 +199,6 @@ def SetupMateMenuBorder( self, color = None ):
             self.window.override_background_color( context.get_state(), color )
         self.border.set_padding( self.borderwidth, self.borderwidth, self.borderwidth, self.borderwidth )
 
-    def SetupMateMenuOpacity( self ):
-        print "Opacity is: " + str(self.opacity)
-        opacity = float(self.opacity) / float(100)
-        print "Setting opacity to: " + str(opacity)
-        if opacity is not 1:
-            self.window.set_opacity(opacity)
-
     def PopulatePlugins( self ):
         self.panesToColor = [ ]
         self.headingsToColor = [ ]
@@ -459,7 +446,7 @@ def show( self ):
         # Hack for opacity not showing on first composited draw
         if self.firstTime:
             self.firstTime = False
-            self.SetupMateMenuOpacity()
+            self.window.set_opacity(1.0)
 
         self.window.get_window().focus( Gdk.CURRENT_TIME )