codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-02-20 07:08:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

PiecesBar rounded corners.

Browse Source
This commit is contained in:
Pedro Algarvio 2011-05-06 09:38:10 +01:00
parent 9b3f5783d5
commit 6d57a29f1d
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
deluge/ui/gtkui/piecesbar.py
View File

@ -35,6 +35,7 @@
# #
import gtk import gtk
import cairo
import pango import pango
import pangocairo import pangocairo
import logging import logging
@ -82,7 +83,10 @@ class PiecesBar(gtk.DrawingArea):
self.height = size.height self.height = size.height
# Handle the expose-event by drawing # Handle the expose-event by drawing
def do_expose_event(self, event=None): def do_expose_event(self, event):
self.draw_pieces(event)
def draw_pieces(self, event):
# Create the cairo context # Create the cairo context
cr = self.window.cairo_create() cr = self.window.cairo_create()
@ -90,18 +94,12 @@ class PiecesBar(gtk.DrawingArea):
cr.rectangle(event.area.x, event.area.y, cr.rectangle(event.area.x, event.area.y,
event.area.width, event.area.height) event.area.width, event.area.height)
cr.clip() cr.clip()
self.__roundcorners_clipping(cr, event)
cr.set_line_width(max(cr.device_to_user_distance(0.5, 0.5)))
cr.set_source_rgb(0.1, 0.1, 0.1)
cr.rectangle(0.0, 0.0, event.area.width, event.area.height)
cr.stroke()
if not self.pieces and self.num_pieces is not None: if not self.pieces and self.num_pieces is not None:
# Complete Torrent # Complete Torrent
piece_height = self.height - 2
piece_width = self.width*1.0/self.num_pieces piece_width = self.width*1.0/self.num_pieces
start = 1 start = 0
for _ in range(self.num_pieces): for _ in range(self.num_pieces):
# Like this to keep same aspect ratio # Like this to keep same aspect ratio
color = self.gtkui_config["pieces_color_%s" % COLOR_STATES[3]] color = self.gtkui_config["pieces_color_%s" % COLOR_STATES[3]]
@ -110,7 +108,7 @@ class PiecesBar(gtk.DrawingArea):
color[1]/65535.0, color[1]/65535.0,
color[2]/65535.0, color[2]/65535.0,
) )
cr.rectangle(start, 1, piece_width, piece_height) cr.rectangle(start, 0, piece_width, self.height)
cr.fill() cr.fill()
start += piece_width start += piece_width
self.__write_text(cr, event) self.__write_text(cr, event)
@ -120,11 +118,9 @@ class PiecesBar(gtk.DrawingArea):
self.__write_text(cr, event) self.__write_text(cr, event)
return return
# Create the cairo context start_pos = 0
start_pos = 1
num_pieces = self.num_pieces and self.num_pieces or len(self.pieces) num_pieces = self.num_pieces and self.num_pieces or len(self.pieces)
piece_width = self.width*1.0/num_pieces piece_width = self.width*1.0/num_pieces
piece_height = self.height - 2
for state in self.pieces: for state in self.pieces:
color = self.gtkui_config["pieces_color_%s" % COLOR_STATES[state]] color = self.gtkui_config["pieces_color_%s" % COLOR_STATES[state]]
@ -133,14 +129,32 @@ class PiecesBar(gtk.DrawingArea):
color[1]/65535.0, color[1]/65535.0,
color[2]/65535.0, color[2]/65535.0,
) )
cr.rectangle(start_pos, 1, piece_width, piece_height) cr.rectangle(start_pos, 0, piece_width, self.height)
cr.fill() cr.fill()
start_pos += piece_width start_pos += piece_width
self.__write_text(cr, event) self.__write_text(cr, event)
def __roundcorners_clipping(self, cr, event):
from math import pi
x = 0
y = 0
width = event.area.width
height = event.area.height
aspect = 1.0
corner_radius = height/10.0
radius = corner_radius/aspect
degrees = pi/180.0
cr.new_sub_path()
cr.arc(x + width - radius, y + radius, radius, -90 * degrees, 0 * degrees)
cr.arc(x + width - radius, y + height - radius, radius, 0 * degrees, 90 * degrees)
cr.arc(x + radius, y + height - radius, radius, 90 * degrees, 180 * degrees)
cr.arc(x + radius, y + radius, radius, 180 * degrees, 270 * degrees)
cr.close_path()
cr.clip()
def __draw_progress_overlay(self, cr): def __draw_progress_overlay(self, cr):
cr.set_source_rgba(0.1, 0.1, 0.1, 0.2) # Transparent cr.set_source_rgba(0.1, 0.1, 0.1, 0.3) # Transparent
cr.rectangle(0.0, 0.0, self.width*self.fraction, self.height) cr.rectangle(0.0, 0.0, self.width*self.fraction, self.height)
cr.fill() cr.fill()

2
deluge/ui/gtkui/status_tab.py
View File

@ -72,7 +72,7 @@ class StatusTab(Tab):
def __init__(self): def __init__(self):
Tab.__init__(self) Tab.__init__(self)
# Get the labels we need to update. # Get the labels we need to update.
# widgetname, modifier function, status keys # widget name, modifier function, status keys
self.glade = glade = component.get("MainWindow").main_glade self.glade = glade = component.get("MainWindow").main_glade
self.progressbar = component.get("MainWindow").main_glade.get_widget("progressbar") self.progressbar = component.get("MainWindow").main_glade.get_widget("progressbar")