rrahl0/gala
1
0
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-11-25 03:06:14 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

clean up Plugin.get_icon_for_window

Browse Source
This commit is contained in:
Rico Tzschichholz 2012-06-05 08:09:30 +02:00
parent 41b4fc1939
commit b27f0d5fad
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Main.vala
View File

@ -125,25 +125,38 @@ namespace Gala
/**
* returns a pixbuf for the application of this window or a default icon
**/
public Gdk.Pixbuf get_icon_for_window (Window window, int size) {
Gdk.Pixbuf image = null;
public static Gdk.Pixbuf get_icon_for_window (Window window, int size)
{
unowned Gtk.IconTheme icon_theme = Gtk.IconTheme.get_default ();
Gdk.Pixbuf? image = null;
var app = Bamf.Matcher.get_default ().get_application_for_xid ((uint32)window.get_xwindow ());
if (app != null) {
var desktop = new GLib.DesktopAppInfo.from_filename (app.get_desktop_file ());
if (app != null && app.get_desktop_file () != null) {
try {
image = Gtk.IconTheme.get_default ().lookup_by_gicon (desktop.get_icon (), size, 0).load_icon ();
} catch (Error e) { warning (e.message); }
var appinfo = new DesktopAppInfo.from_filename (app.get_desktop_file ());
if (appinfo != null) {
var iconinfo = icon_theme.lookup_by_gicon (appinfo.get_icon (), size, 0);
if (iconinfo != null)
image = iconinfo.load_icon ();
}
} catch (Error e) {
warning (e.message);
}
}
if (image == null) {
try {
image = Gtk.IconTheme.get_default ().load_icon ("application-default-icon", size, 0);
image = icon_theme.load_icon ("application-default-icon", size, 0);
} catch (Error e) {
warning (e.message);
}
}
if (image == null) {
image = new Gdk.Pixbuf (Gdk.Colorspace.RGB, true, 8, 1, 1);
image.fill (0x00000000);
}
return image;
}
@ -205,6 +218,7 @@ namespace Gala
{
base.begin_modal (x_get_stage_window (Compositor.get_stage_for_screen (screen)), {}, 0, screen.get_display ().get_current_time ());
}
public new void end_modal ()
{
base.end_modal (get_screen ().get_display ().get_current_time ());

2
src/Widgets/WindowSwitcher.vala
View File

@ -179,7 +179,7 @@ namespace Gala
if (w == null)
return;
var image = plugin.get_icon_for_window (w, ICON_SIZE);
var image = Gala.Plugin.get_icon_for_window (w, ICON_SIZE);
var icon = new GtkClutter.Texture ();
try {

2
src/Widgets/WorkspaceView.vala
View File

@ -343,7 +343,7 @@ namespace Gala
if (app != null)
shown_applications.append (app);
var pix = plugin.get_icon_for_window (w, 32);
var pix = Gala.Plugin.get_icon_for_window (w, 32);
var icon = new GtkClutter.Texture ();
try {
icon.set_from_pixbuf (pix);