Attachment #404804 for bug #551522

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




++ b/src/Toolbar.cc

    unsigned int shape;
} _values[] = {
    { /* unused */ },
    { Toolbar::TOPLEFT,      "TopLeft",      FbTk::ROT0,   FbTk::Shape::BOTTOMRIGHT                            },
    { Toolbar::TOPCENTER,    "TopCenter",    FbTk::ROT0,   FbTk::Shape::BOTTOMRIGHT | FbTk::Shape::BOTTOMLEFT  },
    { Toolbar::TOPRIGHT,     "TopRight",     FbTk::ROT0,   FbTk::Shape::BOTTOMLEFT                             },
    { Toolbar::BOTTOMLEFT,   "BottomLeft",   FbTk::ROT0,   FbTk::Shape::TOPRIGHT                               },
    { Toolbar::BOTTOMCENTER, "BottomCenter", FbTk::ROT0,   FbTk::Shape::TOPRIGHT    | FbTk::Shape::TOPLEFT     },
    { Toolbar::BOTTOMRIGHT,  "BottomRight",  FbTk::ROT0,   FbTk::Shape::TOPLEFT                                },
    { Toolbar::LEFTBOTTOM,   "LeftBottom",   FbTk::ROT270, FbTk::Shape::TOPRIGHT                               },
    { Toolbar::LEFTCENTER,   "LeftCenter",   FbTk::ROT270, FbTk::Shape::TOPRIGHT    | FbTk::Shape::BOTTOMRIGHT },
    { Toolbar::LEFTTOP,      "LeftTop",      FbTk::ROT270, FbTk::Shape::BOTTOMRIGHT                            },
    { Toolbar::RIGHTBOTTOM,  "RightBottom",  FbTk::ROT90,  FbTk::Shape::TOPLEFT                                },
    { Toolbar::RIGHTCENTER,  "RightCenter",  FbTk::ROT90,  FbTk::Shape::TOPLEFT     | FbTk::Shape::BOTTOMLEFT  },
    { Toolbar::RIGHTTOP,     "RightTop",     FbTk::ROT90,  FbTk::Shape::BOTTOMLEFT                             },
};

}

        break;
    case TOPCENTER:
        frame.x += (head_w - static_cast<int>(frame.width))/2 - bw;
        frame.x_hidden = frame.x;
        frame.y_hidden += pixel - bw - static_cast<int>(frame.height);
        break;
    case TOPRIGHT:
        frame.x += head_w - static_cast<int>(frame.width) - bw*2;
        frame.x_hidden = frame.x;
        frame.y_hidden += pixel - bw - static_cast<int>(frame.height);
        break;
    case BOTTOMRIGHT:
        frame.x += head_w - static_cast<int>(frame.width) - bw*2;
        frame.y += head_h - static_cast<int>(frame.height) - bw*2;
        frame.x_hidden = frame.x;
        frame.y_hidden += head_h - bw - pixel;
        break;
    case BOTTOMCENTER: // default is BOTTOMCENTER
        frame.x += (head_w - static_cast<int>(frame.width))/2 - bw;
        frame.y += head_h - static_cast<int>(frame.height) - bw*2;
        frame.x_hidden = frame.x;
        frame.y_hidden += head_h - bw - pixel;
        break;
    case LEFTCENTER:
        frame.y += (head_h - static_cast<int>(frame.height))/2 - bw;
        frame.y_hidden = frame.y;
        frame.x_hidden += pixel - static_cast<int>(frame.width) - bw;
        break;
    case LEFTTOP:

        break;
    case LEFTBOTTOM:
        frame.y = head_h - static_cast<int>(frame.height) - bw*2;
        frame.y_hidden = frame.y;
        frame.x_hidden += pixel - static_cast<int>(frame.width) - bw;
        break;
    case RIGHTCENTER:
        frame.x += head_w - static_cast<int>(frame.width) - bw*2;
        frame.y += (head_h - static_cast<int>(frame.height))/2 - bw;
        frame.x_hidden += head_w - bw - pixel;
        frame.y_hidden = frame.y;
        break;
    case RIGHTTOP:
        frame.x += head_w - static_cast<int>(frame.width) - bw*2;
        frame.x_hidden += head_w - bw - pixel;
        break;
    case RIGHTBOTTOM:
        frame.x += head_w - static_cast<int>(frame.width) - bw*2;
        frame.y += head_h - static_cast<int>(frame.height) - bw*2;
        frame.x_hidden += head_w - bw - pixel;
        frame.y_hidden = frame.y;
        break;
    }


Return to bug 551522

Line Link Here

(-)file_not_specified_in_diff (-17 / +25 lines)
0	-- a/src/Toolbar.cc	0	++ b/src/Toolbar.cc
Lines 80-97 const struct { Link Here
80	unsigned int shape;	80	unsigned int shape;
81	} _values[] = {	81	} _values[] = {
82	{ /* unused */ },	82	{ /* unused */ },
83	{ Toolbar::TOPLEFT, "TopLeft", FbTk::ROT0, FbTk::Shape::BOTTOMRIGHT \| FbTk::Shape::BOTTOMLEFT},	83	{ Toolbar::TOPLEFT, "TopLeft", FbTk::ROT0, FbTk::Shape::BOTTOMRIGHT },
84	{ Toolbar::TOPCENTER, "TopCenter", FbTk::ROT0, FbTk::Shape::TOPRIGHT \| FbTk::Shape::TOPLEFT},	84	{ Toolbar::TOPCENTER, "TopCenter", FbTk::ROT0, FbTk::Shape::BOTTOMRIGHT \| FbTk::Shape::BOTTOMLEFT },
85	{ Toolbar::TOPRIGHT, "TopRight", FbTk::ROT0, FbTk::Shape::BOTTOMRIGHT \| FbTk::Shape::BOTTOMLEFT},	85	{ Toolbar::TOPRIGHT, "TopRight", FbTk::ROT0, FbTk::Shape::BOTTOMLEFT },
86	{ Toolbar::BOTTOMLEFT, "BottomLeft", FbTk::ROT0, FbTk::Shape::TOPRIGHT \| FbTk::Shape::TOPLEFT},	86	{ Toolbar::BOTTOMLEFT, "BottomLeft", FbTk::ROT0, FbTk::Shape::TOPRIGHT },
87	{ Toolbar::BOTTOMCENTER, "BottomCenter", FbTk::ROT0, FbTk::Shape::TOPRIGHT \| FbTk::Shape::TOPLEFT},	87	{ Toolbar::BOTTOMCENTER, "BottomCenter", FbTk::ROT0, FbTk::Shape::TOPRIGHT \| FbTk::Shape::TOPLEFT },
88	{ Toolbar::BOTTOMRIGHT, "BottomRight", FbTk::ROT0, FbTk::Shape::TOPRIGHT \| FbTk::Shape::TOPLEFT},	88	{ Toolbar::BOTTOMRIGHT, "BottomRight", FbTk::ROT0, FbTk::Shape::TOPLEFT },
89	{ Toolbar::LEFTBOTTOM, "LeftBottom", FbTk::ROT270, FbTk::Shape::TOPRIGHT \| FbTk::Shape::BOTTOMRIGHT},	89	{ Toolbar::LEFTBOTTOM, "LeftBottom", FbTk::ROT270, FbTk::Shape::TOPRIGHT },
90	{ Toolbar::LEFTCENTER, "LeftCenter", FbTk::ROT270, FbTk::Shape::TOPRIGHT \| FbTk::Shape::BOTTOMRIGHT},	90	{ Toolbar::LEFTCENTER, "LeftCenter", FbTk::ROT270, FbTk::Shape::TOPRIGHT \| FbTk::Shape::BOTTOMRIGHT },
91	{ Toolbar::LEFTTOP, "LeftTop", FbTk::ROT270, FbTk::Shape::TOPRIGHT \| FbTk::Shape::BOTTOMRIGHT},	91	{ Toolbar::LEFTTOP, "LeftTop", FbTk::ROT270, FbTk::Shape::BOTTOMRIGHT },
92	{ Toolbar::RIGHTBOTTOM, "RightBottom", FbTk::ROT90, FbTk::Shape::TOPLEFT \| FbTk::Shape::BOTTOMLEFT},	92	{ Toolbar::RIGHTBOTTOM, "RightBottom", FbTk::ROT90, FbTk::Shape::TOPLEFT },
93	{ Toolbar::RIGHTCENTER, "RightCenter", FbTk::ROT90, FbTk::Shape::TOPLEFT \| FbTk::Shape::BOTTOMLEFT},	93	{ Toolbar::RIGHTCENTER, "RightCenter", FbTk::ROT90, FbTk::Shape::TOPLEFT \| FbTk::Shape::BOTTOMLEFT },
94	{ Toolbar::RIGHTTOP, "RightTop", FbTk::ROT90, FbTk::Shape::TOPLEFT \| FbTk::Shape::BOTTOMLEFT},	94	{ Toolbar::RIGHTTOP, "RightTop", FbTk::ROT90, FbTk::Shape::BOTTOMLEFT },
95	};	95	};
96		96
97	}	97	}
Lines 648-671 void Toolbar::setPlacement(Toolbar::Placement where) { Link Here
648	break;	648	break;
649	case TOPCENTER:	649	case TOPCENTER:
650	frame.x += (head_w - static_cast<int>(frame.width))/2 - bw;	650	frame.x += (head_w - static_cast<int>(frame.width))/2 - bw;
		651	frame.x_hidden = frame.x;
651	frame.y_hidden += pixel - bw - static_cast<int>(frame.height);	652	frame.y_hidden += pixel - bw - static_cast<int>(frame.height);
652	break;	653	break;
653	case TOPRIGHT:	654	case TOPRIGHT:
654	frame.x += head_w - static_cast<int>(frame.width) - bw*2;	655	frame.x += head_w - static_cast<int>(frame.width) - bw*2;
		656	frame.x_hidden = frame.x;
655	frame.y_hidden += pixel - bw - static_cast<int>(frame.height);	657	frame.y_hidden += pixel - bw - static_cast<int>(frame.height);
656	break;	658	break;
657	case BOTTOMRIGHT:	659	case BOTTOMRIGHT:
658	frame.x += head_w - static_cast<int>(frame.width) - bw*2;	660	frame.x += head_w - static_cast<int>(frame.width) - bw*2;
659	frame.y += head_h - static_cast<int>(frame.height) - bw*2;	661	frame.y += head_h - static_cast<int>(frame.height) - bw*2;
		662	frame.x_hidden = frame.x;
660	frame.y_hidden += head_h - bw - pixel;	663	frame.y_hidden += head_h - bw - pixel;
661	break;	664	break;
662	case BOTTOMCENTER: // default is BOTTOMCENTER	665	case BOTTOMCENTER: // default is BOTTOMCENTER
663	frame.x += (head_w - static_cast<int>(frame.width))/2 - bw;	666	frame.x += (head_w - static_cast<int>(frame.width))/2 - bw;
664	frame.y += head_h - static_cast<int>(frame.height) - bw*2;	667	frame.y += head_h - static_cast<int>(frame.height) - bw*2;
		668	frame.x_hidden = frame.x;
665	frame.y_hidden += head_h - bw - pixel;	669	frame.y_hidden += head_h - bw - pixel;
666	break;	670	break;
667	case LEFTCENTER:	671	case LEFTCENTER:
668	frame.y += (head_h - static_cast<int>(frame.height))/2 - bw;	672	frame.y += (head_h - static_cast<int>(frame.height))/2 - bw;
		673	frame.y_hidden = frame.y;
669	frame.x_hidden += pixel - static_cast<int>(frame.width) - bw;	674	frame.x_hidden += pixel - static_cast<int>(frame.width) - bw;
670	break;	675	break;
671	case LEFTTOP:	676	case LEFTTOP:
Lines 673-693 void Toolbar::setPlacement(Toolbar::Placement where) { Link Here
673	break;	678	break;
674	case LEFTBOTTOM:	679	case LEFTBOTTOM:
675	frame.y = head_h - static_cast<int>(frame.height) - bw*2;	680	frame.y = head_h - static_cast<int>(frame.height) - bw*2;
		681	frame.y_hidden = frame.y;
676	frame.x_hidden += pixel - static_cast<int>(frame.width) - bw;	682	frame.x_hidden += pixel - static_cast<int>(frame.width) - bw;
677	break;	683	break;
678	case RIGHTCENTER:	684	case RIGHTCENTER:
679	frame.x += head_w - static_cast<int>(frame.width) - bw*2;	685	frame.x += head_w - static_cast<int>(frame.width) - bw*2;
680	frame.y += (head_h - static_cast<int>(frame.height))/2 * bw;	686	frame.y += (head_h - static_cast<int>(frame.height))/2 - bw;
681	frame.x_hidden += static_cast<int>(frame.width) + bw - pixel;	687	frame.x_hidden += head_w - bw - pixel;
		688	frame.y_hidden = frame.y;
682	break;	689	break;
683	case RIGHTTOP:	690	case RIGHTTOP:
684	frame.x += head_w - static_cast<int>(frame.width) - bw*2;	691	frame.x += head_w - static_cast<int>(frame.width) - bw*2;
685	frame.x_hidden += static_cast<int>(frame.width) + bw - pixel;	692	frame.x_hidden += head_w - bw - pixel;
686	break;	693	break;
687	case RIGHTBOTTOM:	694	case RIGHTBOTTOM:
688	frame.x += head_w - static_cast<int>(frame.width) - bw*2;	695	frame.x += head_w - static_cast<int>(frame.width) - bw*2;
689	frame.y += head_h - static_cast<int>(frame.height) - bw*2;	696	frame.y += head_h - static_cast<int>(frame.height) - bw*2;
690	frame.x_hidden += static_cast<int>(frame.width) + bw - pixel;	697	frame.x_hidden += head_w - bw - pixel;
		698	frame.y_hidden = frame.y;
691	break;	699	break;
692	}	700	}
693		701