Merge branch 'master' into DefaultUser/trigger_cleanup

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / item / borderimage.qc

diff --git a/qcsrc/menu/item/borderimage.qc b/qcsrc/menu/item/borderimage.qc
index 4acf33d86115c50f3f787cc6ddc6b48256d1574d..ff37b4b86fed56b31d239dd42b3e1e7a2bc75810 100644 (file)
--- a/qcsrc/menu/item/borderimage.qc
+++ b/qcsrc/menu/item/borderimage.qc
@@ -1,29 +1,7 @@
-#ifndef ITEM_BORDERIMAGE_H
-       #define ITEM_BORDERIMAGE_H
-       #include "label.qc"
-       CLASS(BorderImage, Label)
-               METHOD(BorderImage, configureBorderImage, void(entity, string, float, vector, string, float));
-               METHOD(BorderImage, resizeNotify, void(entity, vector, vector, vector, vector));
-               METHOD(BorderImage, recalcPositionWithText, void(entity, string));
-               ATTRIB(BorderImage, isBold, float, 1)
-               METHOD(BorderImage, draw, void(entity));
-               ATTRIB(BorderImage, src, string, string_null)
-               ATTRIB(BorderImage, borderHeight, float, 0)
-               ATTRIB(BorderImage, borderVec, vector, '0 0 0')
-               ATTRIB(BorderImage, color, vector, '1 1 1')
-               ATTRIB(BorderImage, closeButton, entity, NULL)
-               ATTRIB(BorderImage, realFontSize_Nexposeed, vector, '0 0 0')
-               ATTRIB(BorderImage, realOrigin_Nexposeed, vector, '0 0 0')
-               ATTRIB(BorderImage, isNexposeeTitleBar, float, 0)
-               ATTRIB(BorderImage, zoomedOutTitleBarPosition, float, 0)
-               ATTRIB(BorderImage, zoomedOutTitleBar, float, 0)
-               ATTRIB(BorderImage, overrideRealOrigin, vector, '0 1 0')
-               ATTRIB(BorderImage, saveRelOrigin, vector, '0 0 0')
-               ATTRIB(BorderImage, saveRelSize, vector, '0 0 0')
-       ENDCLASS(BorderImage)
-#endif
+#include "borderimage.qh"
 
-#ifdef IMPLEMENTATION
+#include "nexposee.qh"
+#include "dialog.qh"
        void BorderImage_recalcPositionWithText(entity me, string t)
        {
                if (me.isNexposeeTitleBar)
@@ -108,4 +86,3 @@
                        SUPER(BorderImage).draw(me);
                }
        }
-#endif