← Back to branch summary

~cairo-dock-team/cairo-dock-core/3.3.x

« back to all changes in this revision

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

  • Committer: Fabrice Rey
  • Date: 2013-10-18 22:58:34 UTC
  • mfrom: (1652.1.3 cairo-dock-core)
  • Revision ID: fabounet03@gmail.com-20131018225834-kh6rr6r94k5y3mt9
bug-fixs: merged from core revision 1653..1655

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gldit/cairo-dock-dock-manager.c
1125
1125
                }
1126
1126
                else if (bAutoHideOnAnyOverlap)
1127
1127
                {
 
1128
                        pDock->bTemporaryHidden = pDock->bAutoHide;  // needed to use the following function
1128
1129
                        gldi_dock_hide_if_any_window_overlap_or_show (pDock);
1129
1130
                }
1130
1131
                else
1137
1138
                        }
1138
1139
                        if (bAutoHideOnOverlap)
1139
1140
                        {
1140
 
                                pDock->bTemporaryHidden = pDock->bAutoHide;  // astuce pour utiliser la fonction ci-dessous.
 
1141
                                pDock->bTemporaryHidden = pDock->bAutoHide;  // needed to use the following function
1141
1142
                                gldi_dock_hide_show_if_current_window_is_on_our_way (pDock);
1142
1143
                        }
1143
1144
                }
1760
1761
        pDock->fAlign = pPosition->fAlign;
1761
1762
        
1762
1763
        if (pPosition->iNumScreen != pPrevPosition->iNumScreen
1763
 
        || pPosition->iScreenBorder != pPrevPosition->iScreenBorder)  // if the orientation or the screen has changed, the available size may have changed too
 
1764
        || pPosition->iScreenBorder != pPrevPosition->iScreenBorder  // if the orientation or the screen has changed, the available size may have changed too
 
1765
        || pPosition->iGapX != pPrevPosition->iGapX
 
1766
        || pPosition->iGapY != pPrevPosition->iGapY)
1764
1767
        {
1765
1768
                cairo_dock_update_dock_size (pDock);
1766
1769
                cairo_dock_move_resize_dock (pDock);