Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

resolved issue 8884 - the properties don't return all properties and imp... #22

Closed
montegoulding wants to merge 11 commits into from
Closed

resolved issue 8884 - the properties don't return all properties and imp... #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c96281f
resolved issue 8884 - the properties don't return all properties and …
Apr 19, 2013
37d442b
added unbounded scroll properties to group
Apr 19, 2013
c6bf85a
a few more tweaks
Apr 20, 2013
d2c20ec
made some more changes to the properties array and setting properties
Apr 20, 2013
f9f36a9
removed read only stack vScroll, image frameCount. scrollbar orientat…
Apr 21, 2013
f1f3795
setting textSize first before iterating the array to ensure textHeigh…
Apr 23, 2013
b0d6176
set width and height first to ensure they don't break gradients and t…
Apr 24, 2013
a56cef0
a little bit of refactoring on set props and move to returning unicod…
Apr 30, 2013
21cab76
more enhancements for unicode properties which are now individually c…
Apr 30, 2013
7e8e4e3
a bit of refactoring and bugfixing as per comments on the pull request
May 1, 2013
67b0bea
change from uint1 to uindex_t and changed pre-processed handler to re…
May 7, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions engine/src/execpt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,3 +981,27 @@ bool MCExecPoint::copyasnameref(MCNameRef& r_name)
{
return MCNameCreateWithOldString(getsvalue(), r_name);
}

// Assumes the contents of the ep is UTF-16 and attempts conversion to native. If
// successful, the new contents is native and the method returns true, otherwise
// false and the contents remains unchanged.
bool MCExecPoint::trytoconvertutf16tonative()
{
// if empty then it can be native obviously but this also avoids getsvalue returning nil
if (isempty())
return true;

MCExecPoint t_other_ep;
t_other_ep . setsvalue(getsvalue());
t_other_ep . utf16tonative();
t_other_ep . nativetoutf16();

if (getsvalue() . getlength() == t_other_ep . getsvalue() . getlength()
&& memcmp(getsvalue() . getstring(), t_other_ep . getsvalue() . getstring(), getsvalue() . getlength()) == 0)
{
copysvalue(t_other_ep . getsvalue(). getstring(), t_other_ep . getsvalue(). getlength());
return true;
}
return false;
}

2 changes: 2 additions & 0 deletions engine/src/execpt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,8 @@ class MCExecPoint
void concatnameref(MCNameRef name, Exec_concat sep, bool first);

bool copyasnameref(MCNameRef& name);

bool trytoconvertutf16tonative();

private:
void dounicodetomultibyte(bool p_native, bool p_reverse);
Expand Down
2 changes: 1 addition & 1 deletion engine/src/object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ class MCObject : public MCDLlist

// MW-2011-01-14: [[ Bug 9288 ]] Added 'parid' to make sure 'the properties of card id ...' returns
// the correct result.
Exec_stat getproparray(MCExecPoint &ep, uint4 parid);
Exec_stat getproparray(MCExecPoint &ep, uint4 parid, bool effective);

MCObjectHandle *gethandle(void);

Expand Down
2 changes: 1 addition & 1 deletion engine/src/objectprops.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ Exec_stat MCObject::getprop(uint4 parid, Properties which, MCExecPoint &ep, Bool
ep.clear();
break;
case P_PROPERTIES:
return getproparray(ep, parid);
return getproparray(ep, parid, effective);
case P_CUSTOM_PROPERTY_SET:
ep . setnameref_unsafe(getdefaultpropsetname());
break;
Expand Down
Loading