X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fitem%2Fcontainer.qc;h=cacb0124a2123ddf65294a6754ddb86f1945ab2d;hp=449bb0675f773f0e683e9133c8751005d567c99a;hb=86c9dc7c3696c329496b06375c1e79fb407401ce;hpb=fbb96108e5828a7557694db4469c2d0d7c582846 diff --git a/qcsrc/menu/item/container.qc b/qcsrc/menu/item/container.qc index 449bb0675f..cacb0124a2 100644 --- a/qcsrc/menu/item/container.qc +++ b/qcsrc/menu/item/container.qc @@ -2,27 +2,28 @@ #define ITEM_CONTAINER_H #include "../item.qc" CLASS(Container, Item) - METHOD(Container, draw, void(entity)) - METHOD(Container, keyUp, float(entity, float, float, float)) - METHOD(Container, keyDown, float(entity, float, float, float)) - METHOD(Container, mouseMove, float(entity, vector)) - METHOD(Container, mousePress, float(entity, vector)) - METHOD(Container, mouseDrag, float(entity, vector)) - METHOD(Container, mouseRelease, float(entity, vector)) - METHOD(Container, focusLeave, void(entity)) - METHOD(Container, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(Container, resizeNotifyLie, void(entity, vector, vector, vector, vector, .vector, .vector, .vector)) - METHOD(Container, addItem, void(entity, entity, vector, vector, float)) - METHOD(Container, addItemCentered, void(entity, entity, vector, float)) - METHOD(Container, moveItemAfter, void(entity, entity, entity)) - METHOD(Container, removeItem, void(entity, entity)) - METHOD(Container, setFocus, void(entity, entity)) - METHOD(Container, saveFocus, void(entity)) - METHOD(Container, setAlphaOf, void(entity, entity, float)) - METHOD(Container, itemFromPoint, entity(entity, vector)) - METHOD(Container, showNotify, void(entity)) - METHOD(Container, hideNotify, void(entity)) - METHOD(Container, preferredFocusedGrandChild, entity(entity)) + METHOD(Container, draw, void(entity)); + METHOD(Container, keyUp, float(entity, float, float, float)); + METHOD(Container, keyDown, float(entity, float, float, float)); + METHOD(Container, mouseMove, float(entity, vector)); + METHOD(Container, mousePress, float(entity, vector)); + METHOD(Container, mouseDrag, float(entity, vector)); + METHOD(Container, mouseRelease, float(entity, vector)); + METHOD(Container, focusLeave, void(entity)); + METHOD(Container, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(Container, resizeNotifyLie, void(entity, vector, vector, vector, vector, .vector, .vector, .vector)); + METHOD(Container, addItem, void(entity, entity, vector, vector, float)); + METHOD(Container, addItemCentered, void(entity, entity, vector, float)); + METHOD(Container, addItemRightCentered, void(entity, entity, vector, float)); + METHOD(Container, moveItemAfter, void(entity, entity, entity)); + METHOD(Container, removeItem, void(entity, entity)); + METHOD(Container, setFocus, void(entity, entity)); + METHOD(Container, saveFocus, void(entity)); + METHOD(Container, setAlphaOf, void(entity, entity, float)); + METHOD(Container, itemFromPoint, entity(entity, vector)); + METHOD(Container, showNotify, void(entity)); + METHOD(Container, hideNotify, void(entity)); + METHOD(Container, preferredFocusedGrandChild, entity(entity)); ATTRIB(Container, focusable, float, 0) ATTRIB(Container, firstChild, entity, NULL) ATTRIB(Container, lastChild, entity, NULL) @@ -30,9 +31,9 @@ CLASS(Container, Item) ATTRIB(Container, savedFocus, entity, NULL) ATTRIB(Container, shown, float, 0) - METHOD(Container, enterSubitem, void(entity, entity)) - METHOD(Container, enterLieSubitem, void(entity, vector, vector, vector, float)) - METHOD(Container, leaveSubitem, void(entity)) + METHOD(Container, enterSubitem, void(entity, entity)); + METHOD(Container, enterLieSubitem, void(entity, vector, vector, vector, float)); + METHOD(Container, leaveSubitem, void(entity)); ENDCLASS(Container) .entity nextSibling; .entity prevSibling; @@ -282,6 +283,11 @@ void Container_addItemCentered(entity me, entity other, vector theSize, float th me.addItem(me, other, '0.5 0.5 0' - 0.5 * theSize, theSize, theAlpha); } +void Container_addItemRightCentered(entity me, entity other, vector theSize, float theAlpha) +{ + me.addItem(me, other, '1 0.5 0' - 0.5 * theSize, theSize, theAlpha); +} + void Container_addItem(entity me, entity other, vector theOrigin, vector theSize, float theAlpha) { if(other.parent)