Commit 9f4b70a1 authored by cutealien's avatar cutealien

Merge branch releases/1.8 revisions 4773 to 4778 into trunk:

- Fix bug in IGUISkin serialization which messed up serialization of the button-pressed offsets (Thanks at @Midnight for reporting).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4779 dfc29bdd-3216-0410-991c-e03cc46cb475
parent ea41a914
...@@ -58,6 +58,7 @@ Changes in 1.9 (not yet released) ...@@ -58,6 +58,7 @@ Changes in 1.9 (not yet released)
-------------------------- --------------------------
Changes in 1.8.2 Changes in 1.8.2
- Fix bug in IGUISkin serialization which messed up serialization of the button-pressed offsets (Thanks at @Midnight for reporting).
- IGUIStaticText::getTextHeight returns now the correct height for texts with newlines even WordWrap is not set. - IGUIStaticText::getTextHeight returns now the correct height for texts with newlines even WordWrap is not set.
- Crashfix for CGUIEditBox. CGUIEditBox::setMultiLine must break text when changed or other functions like getTextDimension can crash afterward for strings with newline characters. - Crashfix for CGUIEditBox. CGUIEditBox::setMultiLine must break text when changed or other functions like getTextDimension can crash afterward for strings with newline characters.
- CGUIEditBox and the GUI-Editor now convert pasted text correctly using mbstowcs. - CGUIEditBox and the GUI-Editor now convert pasted text correctly using mbstowcs.
......
...@@ -223,7 +223,7 @@ namespace gui ...@@ -223,7 +223,7 @@ namespace gui
"MessageBoxMinTextHeight", "MessageBoxMinTextHeight",
"MessageBoxMaxTextHeight", "MessageBoxMaxTextHeight",
"ButtonPressedImageOffsetX", "ButtonPressedImageOffsetX",
"ButtonPressedImageOffsetY" "ButtonPressedImageOffsetY",
"ButtonPressedTextOffsetX", "ButtonPressedTextOffsetX",
"ButtonPressedTextOffsetY", "ButtonPressedTextOffsetY",
"ButtonPressedSpriteOffsetX", "ButtonPressedSpriteOffsetX",
......
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