← Back to branch summary

~cairo-dock-team/cairo-dock-core/popup_from_shortkey

« back to all changes in this revision

Viewing changes to src/gldit/cairo-dock-module-factory.c

  • Committer: Fabrice Rey
  • Date: 2012-12-17 23:26:50 UTC
  • Revision ID: fabounet03@gmail.com-20121217232650-rpf76vs3atpq8mxc
Icons: changed the sizing algorithm, added allocated and requested size

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gldit/cairo-dock-module-factory.c
253
253
        {
254
254
                gboolean bUnused;
255
255
                cairo_dock_get_size_key_value_helper (pKeyFile, "Icon", "icon ", bUnused, pMinimalConfig->iDesiredIconWidth, pMinimalConfig->iDesiredIconHeight);  // for a dock, if 0, will just get the default size; for a desklet, unused.
256
 
                /**if (pMinimalConfig->iDesiredIconWidth == 0)
257
 
                        pMinimalConfig->iDesiredIconWidth = myIconsParam.iIconWidth;
258
 
                if (pMinimalConfig->iDesiredIconWidth == 0)
259
 
                        pMinimalConfig->iDesiredIconWidth = 48;
260
 
                if (pMinimalConfig->iDesiredIconHeight == 0)
261
 
                        pMinimalConfig->iDesiredIconHeight = myIconsParam.iIconHeight;
262
 
                if (pMinimalConfig->iDesiredIconHeight == 0)
263
 
                        pMinimalConfig->iDesiredIconHeight = 48;*/
264
256
                
265
257
                pMinimalConfig->cLabel = cairo_dock_get_string_key_value (pKeyFile, "Icon", "name", NULL, NULL, NULL, NULL);
266
258
                if (pMinimalConfig->cLabel == NULL && !pInstance->pModule->pVisitCard->bAllowEmptyTitle)
664
656
                        g_key_file_free (pKeyFile);
665
657
                        pKeyFile = NULL;
666
658
                }
667
 
                pIcon->fWidth = pMinimalConfig->iDesiredIconWidth;  // requested size
668
 
                pIcon->fHeight = pMinimalConfig->iDesiredIconHeight;
669
 
                pIcon->iImageWidth = 0;
670
 
                pIcon->iImageHeight = 0;
 
659
                cairo_dock_icon_set_requested_size (pIcon, pMinimalConfig->iDesiredIconWidth, pMinimalConfig->iDesiredIconHeight);
671
660
                
672
661
                // on insere l'icone dans le dock ou on met a jour celui-ci.
673
662
                if (pNewDock != pCurrentDock)  // insert in its new dock.