Skip to content

Commit

Permalink
Fix longstanding transparency bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
phanimahesh committed Apr 1, 2013
1 parent d84f63b commit f56aa3b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
10 changes: 5 additions & 5 deletions UnityTweakTool/section/sphagetti/compiz.py
Expand Up @@ -602,7 +602,7 @@ def on_spin_vertical_desktop_value_changed(self, widget, udata = None):
gsettings.core.set_int('vsize', self.ui['spin_vertical_desktop'].get_value())

def on_color_desk_outline_color_set(self, widget, udata = None):
colorhash = gsettings.color_to_hash(self.ui['color_desk_outline'].get_color())
colorhash = gsettings.color_to_hash(self.ui['color_desk_outline'].get_color(),alpha=1)
gsettings.expo.set_string('selected-color', colorhash)

def on_craccel_compiz_workspace_accel_edited(self, craccel, path, key, mods, hwcode, model = None):
Expand Down Expand Up @@ -701,11 +701,11 @@ def on_sw_window_snapping_active_notify(self, widget, udata=None):
gsettings.core.set_strv('active-plugins', plugins)

def on_color_outline_color_color_set(self, widget, udata=None):
colorhash = gsettings.color_to_hash(self.ui['color_outline_color'].get_color())
colorhash = gsettings.color_to_hash(self.ui['color_outline_color'].get_color(),alpha=1)
gsettings.grid.set_string('outline-color', colorhash)

def on_color_fill_color_color_set(self, widget, udata=None):
colorhash = gsettings.color_to_hash(self.ui['color_fill_color'].get_color())
colorhash = gsettings.color_to_hash(self.ui['color_fill_color'].get_color(),alpha=0.31)
gsettings.grid.set_string('fill-color', colorhash)

def on_b_compiz_windowsnapping_reset_clicked(self, widget):
Expand Down Expand Up @@ -782,11 +782,11 @@ def on_scale_auto_raise_delay_value_changed(self, widget, udata = None):
del value

def on_colorbutton_resize_outline_color_set(self, widget, udata=None):
colorhash = gsettings.color_to_hash(self.ui['colorbutton_resize_outline'].get_color())
colorhash = gsettings.color_to_hash(self.ui['colorbutton_resize_outline'].get_color(),aplha=1)
gsettings.resize.set_string('border-color', colorhash)

def on_colorbutton_resize_fill_color_set(self, widget, udata=None):
colorhash = gsettings.color_to_hash(self.ui['colorbutton_resize_fill'].get_color())
colorhash = gsettings.color_to_hash(self.ui['colorbutton_resize_fill'].get_color(),alpha=0.31)
gsettings.resize.set_string('fill-color', colorhash)

def on_b_wm_additional_reset_clicked(self, widget):
Expand Down
8 changes: 4 additions & 4 deletions UnityTweakTool/section/sphagetti/gsettings.py
Expand Up @@ -96,12 +96,12 @@ def gnome(child):
except Exception:
print("schema %s not installed" % schema)

def color_to_hash(c):
"""Convert a Gdk.Color or Gdk.RGBA object to hex representation"""
def color_to_hash(c,alpha=1):
"""Convert a Gdk.Color or Gdk.RGBA object to hex representation, overriding the alpha if asked"""
if isinstance(c, Gdk.Color):
return "#{:02x}{:02x}{:02x}ff".format(*[round(x*255) for x in [c.red_float, c.green_float, c.blue_float]])
return "#{:02x}{:02x}{:02x}{:02x}".format(*[round(x*255) for x in [c.red_float, c.green_float, c.blue_float,alpha]])
if isinstance(x, Gdk.RGBA):
return "#{:02x}{:02x}{:02x}{:02x}".format(*[round(x*255) for x in [c.red, c.green, c.blue, c.alpha]])
return "#{:02x}{:02x}{:02x}{:02x}".format(*[round(x*255) for x in [c.red, c.green, c.blue, alpha]])
# If it is neither a Gdk.Color object nor a Gdk.RGBA object,
raise NotImplementedError

Expand Down
1 change: 0 additions & 1 deletion data/windowmanager.ui
Expand Up @@ -1163,7 +1163,6 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">start</property>
<property name="use_alpha">True</property>
<signal name="color-set" handler="on_color_fill_color_color_set" swapped="no"/>
</object>
<packing>
Expand Down

0 comments on commit f56aa3b

Please sign in to comment.