sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ellipsize tabs only when necessary (unknown title size basically)

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2006-04-21 18:34:41 -04:00
parent c5a70f1798
commit 490c146da9
3 changed files with 44 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/browser.py
View File

@ -148,6 +148,7 @@ class BrowserActivity(activity.Activity):
self.uri = uri self.uri = uri
def activity_on_connected_to_shell(self): def activity_on_connected_to_shell(self):
self.activity_set_ellipsize_tab(True)
self.activity_set_can_close(True) self.activity_set_can_close(True)
self.activity_set_tab_text("Web Page") self.activity_set_tab_text("Web Page")

7
shell/example-activity/activity.py
View File

@ -61,6 +61,13 @@ class Activity(dbus.service.Object):
def activity_get_gtk_plug(self): def activity_get_gtk_plug(self):
return self.__plug return self.__plug
def activity_set_ellipsize_tab(self, ellipsize):
self.__activity_object.set_ellipsize_tab(ellipsize)
@dbus.service.method("com.redhat.Sugar.Activity", \
in_signature="", \
out_signature="")
def activity_set_can_close(self, can_close): def activity_set_can_close(self, can_close):
self.__activity_object.set_can_close(can_close) self.__activity_object.set_can_close(can_close)

47
shell/src/shell.py
View File

@ -20,6 +20,7 @@ class ActivityHost(dbus.service.Object):
global activity_counter global activity_counter
self.activity_name = activity_name self.activity_name = activity_name
self.ellipsize_tab = False
self.activity_container = activity_container self.activity_container = activity_container
@ -41,12 +42,11 @@ class ActivityHost(dbus.service.Object):
hbox.pack_start(self.tab_activity_image) hbox.pack_start(self.tab_activity_image)
self.tab_activity_image.show() self.tab_activity_image.show()
label_hbox = gtk.HBox(False, 4); self.label_hbox = gtk.HBox(False, 4);
label_hbox.connect("style-set", self.__tab_label_style_set_cb) self.label_hbox.connect("style-set", self.__tab_label_style_set_cb)
hbox.pack_start(label_hbox) hbox.pack_start(self.label_hbox)
self.tab_label = gtk.Label(self.activity_name) self.tab_label = gtk.Label(self.activity_name)
self.tab_label.set_ellipsize(pango.ELLIPSIZE_END)
self.tab_label.set_single_line_mode(True) self.tab_label.set_single_line_mode(True)
self.tab_label.set_alignment(0.0, 0.5) self.tab_label.set_alignment(0.0, 0.5)
self.tab_label.set_padding(0, 0) self.tab_label.set_padding(0, 0)
@ -65,9 +65,9 @@ class ActivityHost(dbus.service.Object):
self.tab_close_button.set_focus_on_click(gtk.FALSE) self.tab_close_button.set_focus_on_click(gtk.FALSE)
self.tab_close_button.connect("clicked", self.tab_close_button_clicked) self.tab_close_button.connect("clicked", self.tab_close_button_clicked)
label_hbox.pack_start(self.tab_label) self.label_hbox.pack_start(self.tab_label)
label_hbox.pack_start(self.tab_close_button, False, False, 0) self.label_hbox.pack_start(self.tab_close_button, False, False, 0)
label_hbox.show() self.label_hbox.show()
hbox.show() hbox.show()
@ -97,6 +97,13 @@ class ActivityHost(dbus.service.Object):
self.__peer_service_name, self.__peer_object_name), \ self.__peer_service_name, self.__peer_object_name), \
"com.redhat.Sugar.Activity") "com.redhat.Sugar.Activity")
@dbus.service.method("com.redhat.Sugar.Shell.ActivityHost", \
in_signature="b", \
out_signature="")
def set_ellipsize_tab(self, ellipsize):
self.ellipsize_tab = True
self.update_tab_size()
@dbus.service.method("com.redhat.Sugar.Shell.ActivityHost", \ @dbus.service.method("com.redhat.Sugar.Shell.ActivityHost", \
in_signature="b", \ in_signature="b", \
out_signature="") out_signature="")
@ -136,13 +143,29 @@ class ActivityHost(dbus.service.Object):
def get_object_path(self): def get_object_path(self):
return self.dbus_object_name return self.dbus_object_name
def __tab_label_style_set_cb(self, widget, previous_style): def update_tab_size(self):
context = widget.get_pango_context() if self.ellipsize_tab:
metrics = context.get_metrics(widget.style.font_desc, context.get_language()) self.tab_label.set_ellipsize(pango.ELLIPSIZE_END)
context = self.label_hbox.get_pango_context()
font_desc = self.label_hbox.style.font_desc
metrics = context.get_metrics(font_desc, context.get_language())
char_width = metrics.get_approximate_digit_width() char_width = metrics.get_approximate_digit_width()
[w, h] = gtk.icon_size_lookup_for_settings(widget.get_settings(), gtk.ICON_SIZE_MENU) [w, h] = self.__get_close_icon_size()
widget.set_size_request(15 * pango.PIXELS(char_width) + 2 * w, -1); tab_width = 15 * pango.PIXELS(char_width) + 2 * w
self.label_hbox.set_size_request(tab_width, -1);
else:
self.tab_label.set_ellipsize(pango.ELLIPSIZE_NONE)
widget.set_size_request(-1, -1)
def __get_close_icon_size(self):
settings = self.label_hbox.get_settings()
return gtk.icon_size_lookup_for_settings(settings, gtk.ICON_SIZE_MENU)
def __tab_label_style_set_cb(self, widget, previous_style):
[w, h] = self.__get_close_icon_size()
self.tab_close_button.set_size_request (w + 5, h + 2) self.tab_close_button.set_size_request (w + 5, h + 2)
self.update_tab_size()
class ActivityContainer(dbus.service.Object): class ActivityContainer(dbus.service.Object):