Attachment #74189 for bug #114679

View | Details | Raw Unified | Return to bug 114679
Collapse All | Expand All




        if (FbTk::KeyUtil::instance().cleanMods(be.state) != 0)
            return;

        // taken from shade control in Window.cc
        // should apply to desktop wheeling as well
        int reverse = 0;
        if (screen->getScrollReverse())
            reverse = 1;

        if (be.button == 1) {
            if (! screen->isRootColormapInstalled())
                screen->imageControl().installRootColormap();

        } else if (be.button == 3) {
            FbCommands::ShowRootMenuCmd cmd;
            cmd.execute();
        } else if (screen->isDesktopWheeling() && be.button == 4 + reverse) {
            screen->nextWorkspace(1);
        } else if (screen->isDesktopWheeling() && be.button == 5 - reverse) {
            screen->prevWorkspace(1);
        }







void Toolbar::buttonReleaseEvent(XButtonEvent &re) {
    // taken from shade control in Window.cc
    // should apply to desktop wheeling as well
    int reverse = 0;
    if (screen().getScrollReverse())
        reverse = 1;

    if (re.button == 1)
        raise();
    else if (re.button == 4 + reverse) //mousewheel scroll up
        screen().nextWorkspace(1);
    else if (re.button == 5 - reverse)	//mousewheel scroll down
        screen().prevWorkspace(1);
}


Return to bug 114679

Lines 927-932 Link Here

(-)fluxbox-0.9.14/src/fluxbox.cc (-2 / +8 lines)
927	if (FbTk::KeyUtil::instance().cleanMods(be.state) != 0)	927	if (FbTk::KeyUtil::instance().cleanMods(be.state) != 0)
928	return;	928	return;
929		929
		930	// taken from shade control in Window.cc
		931	// should apply to desktop wheeling as well
		932	int reverse = 0;
		933	if (screen->getScrollReverse())
		934	reverse = 1;
		935
930	if (be.button == 1) {	936	if (be.button == 1) {
931	if (! screen->isRootColormapInstalled())	937	if (! screen->isRootColormapInstalled())
932	screen->imageControl().installRootColormap();	938	screen->imageControl().installRootColormap();
Lines 942-950 Link Here
942	} else if (be.button == 3) {	948	} else if (be.button == 3) {
943	FbCommands::ShowRootMenuCmd cmd;	949	FbCommands::ShowRootMenuCmd cmd;
944	cmd.execute();	950	cmd.execute();
945	} else if (screen->isDesktopWheeling() && be.button == 4) {	951	} else if (screen->isDesktopWheeling() && be.button == 4 + reverse) {
946	screen->nextWorkspace(1);	952	screen->nextWorkspace(1);
947	} else if (screen->isDesktopWheeling() && be.button == 5) {	953	} else if (screen->isDesktopWheeling() && be.button == 5 - reverse) {
948	screen->prevWorkspace(1);	954	screen->prevWorkspace(1);
949	}	955	}
950		956

Lines 517-527 Link Here

(-)fluxbox-0.9.14/src/Toolbar.cc (-2 / +8 lines)
517		517
518		518
519	void Toolbar::buttonReleaseEvent(XButtonEvent &re) {	519	void Toolbar::buttonReleaseEvent(XButtonEvent &re) {
		520	// taken from shade control in Window.cc
		521	// should apply to desktop wheeling as well
		522	int reverse = 0;
		523	if (screen().getScrollReverse())
		524	reverse = 1;
		525
520	if (re.button == 1)	526	if (re.button == 1)
521	raise();	527	raise();
522	else if (re.button == 4) //mousewheel scroll up	528	else if (re.button == 4 + reverse) //mousewheel scroll up
523	screen().nextWorkspace(1);	529	screen().nextWorkspace(1);
524	else if (re.button == 5) //mousewheel scroll down	530	else if (re.button == 5 - reverse) //mousewheel scroll down
525	screen().prevWorkspace(1);	531	screen().prevWorkspace(1);
526	}	532	}
527		533