mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 03:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hob: Fixed a compatible issue for indicator icon view

Browse Source 
Because some screen not support the alpha visual channel, so the function
'screen.get_rgba_colormap()' will return None, it's a compatible issue, so
change it by another way.

(Bitbake rev: e58ba1ad944ea1ba95a5ada80d4c88f0165bd1ca)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Liming An
2012-05-30 20:01:10 +08:00
committed by Richard Purdie
parent cc3da1236c
commit 6609a813bb
1 changed files with 8 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
bitbake/lib/bb/ui/crumbs/hobwidget.py
View File

@@ -400,50 +400,33 @@ class HobInfoButton(gtk.EventBox):
class HobIndicator(gtk.DrawingArea): class HobIndicator(gtk.DrawingArea):
def __init__(self, count): def __init__(self, count):
gtk.DrawingArea.__init__(self) gtk.DrawingArea.__init__(self)
# Set no window for transparent background
# We want to composite the transparent indicator onto the parent self.set_has_window(False)
# HBox
screen = self.get_screen()
rgba = screen.get_rgba_colormap()
self.set_colormap(rgba)
self.set_app_paintable(True)
self.set_size_request(38,38) self.set_size_request(38,38)
# We need to pass through button clicks # We need to pass through button clicks
self.add_events(gtk.gdk.BUTTON_PRESS_MASK | gtk.gdk.BUTTON_RELEASE_MASK) self.add_events(gtk.gdk.BUTTON_PRESS_MASK | gtk.gdk.BUTTON_RELEASE_MASK)
self.connect('expose-event', self.expose) self.connect('expose-event', self.expose)
self.connect_after('realize', self.composite)
self.count = count self.count = count
self.color = HobColors.GRAY self.color = HobColors.GRAY
def composite(self, widget):
# This property must be set after the widget has been realised
self.window.set_composited(True)
def expose(self, widget, event): def expose(self, widget, event):
# Transparent background
ctx = widget.window.cairo_create()
ctx.set_operator(cairo.OPERATOR_CLEAR)
region = gtk.gdk.region_rectangle(event.area)
ctx.region(region)
ctx.fill()
if self.count and self.count > 0: if self.count and self.count > 0:
w = self.allocation.width ctx = widget.window.cairo_create()
h = self.allocation.height
x, y, w, h = self.allocation
ctx.set_operator(cairo.OPERATOR_OVER) ctx.set_operator(cairo.OPERATOR_OVER)
ctx.set_source_color(gtk.gdk.color_parse(self.color)) ctx.set_source_color(gtk.gdk.color_parse(self.color))
ctx.translate(w/2, h/2) ctx.translate(w/2, h/2)
ctx.arc(1, 1, min(w,h)/2 - 2, 0, 2*math.pi) ctx.arc(x, y, min(w,h)/2 - 2, 0, 2*math.pi)
ctx.fill_preserve() ctx.fill_preserve()
layout = self.create_pango_layout(str(self.count)) layout = self.create_pango_layout(str(self.count))
textw, texth = layout.get_pixel_size() textw, texth = layout.get_pixel_size()
x = (w/2)-(textw/2) + 1 x = (w/2)-(textw/2) + x
y = (h/2) - (texth/2) + 1 y = (h/2) - (texth/2) + y
ctx.move_to(x, y) ctx.move_to(x, y)
self.window.draw_layout(self.style.light_gc[gtk.STATE_NORMAL], int(x), int(y), layout) self.window.draw_layout(self.style.light_gc[gtk.STATE_NORMAL], int(x), int(y), layout)
@@ -466,24 +449,6 @@ class HobTabLabel(gtk.HBox):
self.lbl.set_alignment(0.0, 0.5) self.lbl.set_alignment(0.0, 0.5)
self.lbl.show() self.lbl.show()
self.pack_end(self.lbl, True, True, 6) self.pack_end(self.lbl, True, True, 6)
self.connect_after('expose-event', self.expose_event)
def expose_event(self, widget, event):
# Composite the child indicator onto the Box
child = self.indicator
ctx = widget.window.cairo_create()
ctx.set_source_pixmap(child.window, child.allocation.x, child.allocation.y)
region = gtk.gdk.region_rectangle(child.allocation)
r = gtk.gdk.region_rectangle(event.area)
region.intersect(r)
ctx.region(region)
ctx.clip()
ctx.paint()
return False
def set_count(self, count): def set_count(self, count):
self.indicator.set_count(count) self.indicator.set_count(count)