← Back to branch summary

~cmiller/ubuntu/trusty/icewm/translations-cause-crash-lp447883

« back to all changes in this revision

Viewing changes to src/wmtaskbar.cc

  • Committer: Bazaar Package Importer
  • Author(s): Eduard Bloch
  • Date: 2009-01-26 00:18:14 UTC
  • mfrom: (1.3.1 upstream) (5.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20090126001814-ea5ceoy4uroruz72
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/wmtaskbar.cc
181
181
}
182
182
 
183
183
extern unsigned int ignore_enternotify_hack;
 
184
 
184
185
void EdgeTrigger::handleCrossing(const XCrossingEvent &crossing) {
185
 
    if (crossing.serial != ignore_enternotify_hack && crossing.serial != ignore_enternotify_hack + 1)
186
 
    {
187
186
    if (crossing.type == EnterNotify /* && crossing.mode != NotifyNormal */) {
188
 
        fDoShow = true;
 
187
        if (crossing.serial != ignore_enternotify_hack && crossing.serial != ignore_enternotify_hack + 1)
 
188
        {
 
189
            fDoShow = true;
 
190
            if (fAutoHideTimer)
 
191
                fAutoHideTimer->startTimer(autoShowDelay);
 
192
        }
 
193
    } else if (crossing.type == LeaveNotify /* && crossing.mode != NotifyNormal */) {
 
194
        fDoShow = false;
189
195
        if (fAutoHideTimer)
190
 
            fAutoHideTimer->startTimer(autoShowDelay);
191
 
    } else if (crossing.type == LeaveNotify /* && crossing.mode != NotifyNormal */) {
192
 
    }
 
196
            fAutoHideTimer->stopTimer();
193
197
    }
194
198
}
195
199
 
1023
1027
}
1024
1028
 
1025
1029
bool TaskBar::autoTimer(bool doShow) {
1026
 
    if (fFullscreen && doShow) {
 
1030
    if (fFullscreen && doShow && taskBarFullscreenAutoShow) {
1027
1031
        fIsHidden = false;
1028
1032
        getFrame()->focus();
1029
1033
        manager->switchFocusTo(getFrame(), true);