Commit d1f61e31 authored by bitplane's avatar bitplane

recalculate clipping rectangle after setNotClipped, reported by Aelis440

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2245 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 29aa6ecd
...@@ -160,6 +160,7 @@ public: ...@@ -160,6 +160,7 @@ public:
void setNotClipped(bool noClip) void setNotClipped(bool noClip)
{ {
NoClip = noClip; NoClip = noClip;
updateAbsolutePosition();
} }
...@@ -825,7 +826,6 @@ public: ...@@ -825,7 +826,6 @@ public:
out->addRect("Rect", DesiredRect); out->addRect("Rect", DesiredRect);
out->addPosition2d("MinSize", core::position2di(MinSize.Width, MinSize.Height)); out->addPosition2d("MinSize", core::position2di(MinSize.Width, MinSize.Height));
out->addPosition2d("MaxSize", core::position2di(MaxSize.Width, MaxSize.Height)); out->addPosition2d("MaxSize", core::position2di(MaxSize.Width, MaxSize.Height));
out->addBool("NoClip", NoClip);
out->addEnum("LeftAlign", AlignLeft, GUIAlignmentNames); out->addEnum("LeftAlign", AlignLeft, GUIAlignmentNames);
out->addEnum("RightAlign", AlignRight, GUIAlignmentNames); out->addEnum("RightAlign", AlignRight, GUIAlignmentNames);
out->addEnum("TopAlign", AlignTop, GUIAlignmentNames); out->addEnum("TopAlign", AlignTop, GUIAlignmentNames);
...@@ -835,6 +835,7 @@ public: ...@@ -835,6 +835,7 @@ public:
out->addBool("TabStop", IsTabStop); out->addBool("TabStop", IsTabStop);
out->addBool("TabGroup", IsTabGroup); out->addBool("TabGroup", IsTabGroup);
out->addInt("TabOrder", TabOrder); out->addInt("TabOrder", TabOrder);
out->addBool("NoClip", NoClip);
} }
...@@ -857,13 +858,14 @@ public: ...@@ -857,13 +858,14 @@ public:
p = in->getAttributeAsPosition2d("MinSize"); p = in->getAttributeAsPosition2d("MinSize");
setMinSize(core::dimension2du(p.X,p.Y)); setMinSize(core::dimension2du(p.X,p.Y));
setNotClipped(in->getAttributeAsBool("NoClip"));
setAlignment((EGUI_ALIGNMENT) in->getAttributeAsEnumeration("LeftAlign", GUIAlignmentNames), setAlignment((EGUI_ALIGNMENT) in->getAttributeAsEnumeration("LeftAlign", GUIAlignmentNames),
(EGUI_ALIGNMENT)in->getAttributeAsEnumeration("RightAlign", GUIAlignmentNames), (EGUI_ALIGNMENT)in->getAttributeAsEnumeration("RightAlign", GUIAlignmentNames),
(EGUI_ALIGNMENT)in->getAttributeAsEnumeration("TopAlign", GUIAlignmentNames), (EGUI_ALIGNMENT)in->getAttributeAsEnumeration("TopAlign", GUIAlignmentNames),
(EGUI_ALIGNMENT)in->getAttributeAsEnumeration("BottomAlign", GUIAlignmentNames)); (EGUI_ALIGNMENT)in->getAttributeAsEnumeration("BottomAlign", GUIAlignmentNames));
setRelativePosition(in->getAttributeAsRect("Rect")); setRelativePosition(in->getAttributeAsRect("Rect"));
setNotClipped(in->getAttributeAsBool("NoClip"));
} }
protected: protected:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment