On Mon, 18 Jun 2012 at 23:11:27 +0200, Rodolfo García Peñas wrote:
> Subject: [PATCH 05/12] Create WAppIcon always
>
> When the application is created, the WAppIcon now is created always,
> but is only painted if the flag is not set.
>
> The icon initialization to NULL can be done now at app_icon_create_from_docks
> because is always called.
> ---
> src/appicon.c | 3 +++
> src/application.c | 23 ++++++++++-------------
> 2 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/src/appicon.c b/src/appicon.c
> index c19efa0..ed4403c 100644
> --- a/src/appicon.c
> +++ b/src/appicon.c
> @@ -975,6 +975,9 @@ void app_icon_create_from_docks(WWindow *wwin,
> WApplication *wapp, Window main_w
> {
> WScreen *scr = wwin->screen_ptr;
>
> + /* Create the application icon */
> + wapp->app_icon = NULL;
> +
> if (scr->last_dock)
> wapp->app_icon = findDockIconFor(scr->last_dock, main_window);
>
> diff --git a/src/application.c b/src/application.c
> index be305b2..f29e90f 100644
> --- a/src/application.c
> +++ b/src/application.c
> @@ -158,20 +158,17 @@ WApplication *wApplicationCreate(WWindow * wwin)
> /* application descriptor */
> XSaveContext(dpy, main_window, wAppWinContext, (XPointer) wapp);
>
> - /* Create the application icon */
> - wapp->app_icon = NULL;
> - if (!WFLAGP(wapp->main_window_desc, no_appicon)) {
> - /* Create the application icon using the icon from docks
> - * If not found in docks, create a new icon
> - * using the function wAppIconCreate() */
> - app_icon_create_from_docks(wwin, wapp, main_window);
> -
> - /* Now, paint the icon */
> - paint_app_icon(wapp);
> + /* Create the application icon using the icon from docks
> + * If not found in docks, create a new icon
> + * using the function wAppIconCreate() */
> + app_icon_create_from_docks(wwin, wapp, main_window);
It's just a small detail, but I think it is more natural to create the
appicon calling a function named wAppIconCreate() instead of calling
app_icon_create_from_docks() which ultimately calls wAppIconCreate()
if the icon is not found in the dock.
Perhaps the function app_icon_create_from_docks() should be called
from wAppIconCreate() and not the reverse. I will apply this patch,
but I thought I should raise this question here anyway for a possible
further streamlining.
>
> - /* Save the app_icon in a file */
> - save_app_icon(wwin, wapp);
> - }
> + /* Save the app_icon in a file */
> + save_app_icon(wwin, wapp);
> +
> + /* Now, paint the icon */
> + if (!WFLAGP(wapp->main_window_desc, no_appicon))
> + paint_app_icon(wapp);
>
> return wapp;
> }
> --
> 1.7.10
>
--
To unsubscribe, send mail to [email protected].
