From fa5883745fec21223d528eff046c10da81003a5a Mon Sep 17 00:00:00 2001 From: cxl Date: Fri, 16 May 2014 06:24:01 +0000 Subject: [PATCH] CtrlCore: GTK TopWindow::LargeIcon implementation git-svn-id: svn://ultimatepp.org/upp/trunk@7383 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlCore/GtkTop.cpp | 9 ++++++++- uppsrc/CtrlCore/GtkTop.h | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/uppsrc/CtrlCore/GtkTop.cpp b/uppsrc/CtrlCore/GtkTop.cpp index d13e50f1e..e1d325288 100644 --- a/uppsrc/CtrlCore/GtkTop.cpp +++ b/uppsrc/CtrlCore/GtkTop.cpp @@ -48,8 +48,15 @@ void TopWindow::SyncCaption() GuiLock __; SyncTitle(); if(top) { + GList *icons = NULL; if(gdk_icon.Set(icon)) - gtk_window_set_icon(gtk(), gdk_icon); + icons = g_list_append(icons, gdk_icon); + if(gdk_largeicon.Set(largeicon)) + icons = g_list_append(icons, gdk_largeicon); + if(icons != NULL) { + gtk_window_set_icon_list(gtk(), icons); + g_list_free(icons); + } gtk_window_set_decorated(gtk(), !frameless); gtk_window_set_urgency_hint(gtk(), urgent); } diff --git a/uppsrc/CtrlCore/GtkTop.h b/uppsrc/CtrlCore/GtkTop.h index 6e0efc8ce..38603279e 100644 --- a/uppsrc/CtrlCore/GtkTop.h +++ b/uppsrc/CtrlCore/GtkTop.h @@ -1,5 +1,6 @@ //$ class TopWindow : Ctrl { ImageGdk gdk_icon; + ImageGdk gdk_largeicon; bool topmost; enum { FULLSCREEN = 99 }; @@ -11,4 +12,4 @@ static gboolean StateEvent(GtkWidget *widget, GdkEventWindowState *event, gpointer user_data); friend class Ctrl; -//$ }; \ No newline at end of file +//$ };