X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fitem%2Flabel.qc;h=ea170777eaf7245c26645fcd6c2a3dc8f5ed138e;hp=75e79f0b228394e3d5da4c0c377992e9a1e12b4b;hb=96e1acc3050bcb718e2f06702e5b88a60459a015;hpb=6e12e42c14caa13f188ad12ce1fce1358428bee4 diff --git a/qcsrc/menu/item/label.qc b/qcsrc/menu/item/label.qc index 75e79f0b2..ea170777e 100644 --- a/qcsrc/menu/item/label.qc +++ b/qcsrc/menu/item/label.qc @@ -2,12 +2,12 @@ #define ITEM_LABEL_H #include "../item.qc" CLASS(Label, Item) - METHOD(Label, configureLabel, void(entity, string, float, float)) - METHOD(Label, draw, void(entity)) - METHOD(Label, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(Label, setText, void(entity, string)) - METHOD(Label, toString, string(entity)) - METHOD(Label, recalcPositionWithText, void(entity, string)) + METHOD(Label, configureLabel, void(entity, string, float, float)); + METHOD(Label, draw, void(entity)); + METHOD(Label, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(Label, setText, void(entity, string)); + METHOD(Label, toString, string(entity)); + METHOD(Label, recalcPositionWithText, void(entity, string)); ATTRIB(Label, isBold, float, 0) ATTRIB(Label, text, string, string_null) ATTRIB(Label, currentText, string, string_null) @@ -81,7 +81,7 @@ void Label_recalcPositionWithText(entity me, string t) me.realOrigin_x = me.keepspaceLeft; if(!me.overrideCondenseFactor) me.condenseFactor = spaceAvail / spaceUsed; - dprintf("NOTE: label text %s too wide for label, condensed by factor %f\n", t, me.condenseFactor); + LOG_TRACEF("NOTE: label text %s too wide for label, condensed by factor %f\n", t, me.condenseFactor); } if(!me.overrideRealOrigin_y) @@ -130,8 +130,8 @@ void Label_resizeNotify(entity me, vector relOrigin, vector relSize, vector absO SUPER(Label).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); // absSize_y is height of label - me.realFontSize_y = me.fontSize / absSize.y; - me.realFontSize_x = me.fontSize / absSize.x; + me.realFontSize_y = absSize.y == 0 ? 0 : (me.fontSize / absSize.y); + me.realFontSize_x = absSize.x == 0 ? 0 : (me.fontSize / absSize.x); if(me.marginLeft) me.keepspaceLeft = me.marginLeft * me.realFontSize.x; if(me.marginRight)