← Back to branch summary

~ubuntu-branches/ubuntu/vivid/cairo-dock/vivid

« back to all changes in this revision

Viewing changes to src/gldit/cairo-dock-dock-manager.c

  • Committer: Matthieu Baerts
  • Date: 2013-03-25 23:33:47 UTC
  • mfrom: (1.1.31)
  • Revision ID: matttbe@gmail.com-20130325233347-tntqszmhp5ji5cj0
Tags: 3.2.0-0ubuntu1
* New upstream release.
* Upstream ChangeLog:
  - Enable the Indicator-Generic by default on a Cairo-Dock session under
    Ubuntu
  - Removed the deprecated option 'hide on fullscreen'
  - Task: fixed a bug in cairo_dock_stop_task
  - BSD port: fixed some compilation and linking problems
  - Taskbar: fixed a bug where an icon didn't stop demanding the attention
  - Docks: when changing the alignment of the main dock, correctly update
    the dock
  - Removed the need for pangox (was not used)
  - Drop on container: add URI target before the text target, or we will
    get the link text instead of the link URI in Konqueror (other browsers
    don't have this problem)
  - If an applet crashed the dock when launching it, this applet was
    not blacklisted
  - GUI: fixed a crash in the ModuleWidget class
  - Core: separated gldi-config.h in 2 parts, so that the one that is
    installed doesn't contain any architecture-dependant value
  - po: Imported translations from Launchpad
* debian/control:
  - Mutter is now better supported by the dock: added on the recommended
    list
* debian/rules:
  - CMake flag: replaced 'yes' by 'ON'

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gldit/cairo-dock-dock-manager.c
477
477
{
478
478
        CairoDockForeachIconFunc pFunction = data[0];
479
479
        gpointer pUserData = data[1];
480
 
        GList *ic;
481
 
        for (ic = pDock->icons; ic != NULL; ic = ic->next)
 
480
        GList *ic = pDock->icons, *next_ic;
 
481
        while (ic != NULL)
482
482
        {
 
483
                next_ic = ic->next;  // the function bolew may remove the current icon
483
484
                pFunction ((Icon*)ic->data, CAIRO_CONTAINER (pDock), pUserData);
 
485
                ic = next_ic;
484
486
        }
485
487
}
486
488
void cairo_dock_foreach_icons_in_docks (CairoDockForeachIconFunc pFunction, gpointer pUserData)
1310
1312
                                pDock->bAutoHide = FALSE;
1311
1313
                                cairo_dock_start_showing (pDock);
1312
1314
                        }
1313
 
                        if (bAutoHideOnOverlap || myDocksParam.bAutoHideOnFullScreen)
 
1315
                        if (bAutoHideOnOverlap)
1314
1316
                        {
1315
1317
                                pDock->bTemporaryHidden = pDock->bAutoHide;  // astuce pour utiliser la fonction ci-dessous.
1316
1318
                                cairo_dock_hide_show_if_current_window_is_on_our_way (pDock);
1541
1543
        }
1542
1544
        
1543
1545
        //\____________________ Autres parametres.
1544
 
        pAccessibility->iMaxAuthorizedWidth = cairo_dock_get_integer_key_value (pKeyFile, "Accessibility", "max_authorized_width", &bFlushConfFileNeeded, 0, "Position", NULL);  // obsolete, cache en conf.
1545
 
        
1546
1546
        double fSensitivity = cairo_dock_get_double_key_value (pKeyFile, "Accessibility", "edge sensitivity", &bFlushConfFileNeeded, -1, NULL, NULL);  // replace "unhide delay"
1547
1547
        if (fSensitivity < 0)  // old param
1548
1548
        {
1552
1552
        }
1553
1553
        pAccessibility->iUnhideDockDelay = fSensitivity * 1000;  // so we decreased the old delay by 1.5, since we handle mouse movements better.
1554
1554
        
1555
 
        pAccessibility->bAutoHideOnFullScreen = cairo_dock_get_boolean_key_value (pKeyFile, "Accessibility", "auto quick hide", &bFlushConfFileNeeded, FALSE, "TaskBar", NULL);
1556
 
        //pAccessibility->bAutoHideOnFullScreen = FALSE;
1557
 
        
1558
1555
        //\____________________ sous-docks.
1559
1556
        pAccessibility->iLeaveSubDockDelay = cairo_dock_get_integer_key_value (pKeyFile, "Accessibility", "leaving delay", &bFlushConfFileNeeded, 330, "System", NULL);
1560
1557
        pAccessibility->iShowSubDockDelay = cairo_dock_get_integer_key_value (pKeyFile, "Accessibility", "show delay", &bFlushConfFileNeeded, 300, "System", NULL);
1720
1717
        pDock->iGapX = pPosition->iGapX;
1721
1718
        pDock->iGapY = pPosition->iGapY;
1722
1719
        pDock->fAlign = pPosition->fAlign;
 
1720
        if (pPosition->fAlign != pPrevPosition->fAlign)
 
1721
        {
 
1722
                cairo_dock_update_dock_size (pDock);
 
1723
                cairo_dock_move_resize_dock (pDock);
 
1724
        }
1723
1725
        cairo_dock_calculate_dock_icons (pDock);
1724
1726
        cairo_dock_move_resize_dock (pDock);
1725
1727
        if (bWasHorizontal != pDock->container.bIsHorizontal)