Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-11269] Kitchen sink:Base UI:Window Properties->Toggling height/wi... #3582

Merged
merged 10 commits into from
Dec 19, 2012
Merged

[TIMOB-11269] Kitchen sink:Base UI:Window Properties->Toggling height/wi... #3582

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
89cf3c6
[TIMOB-11269] Kitchen sink:Base UI:Window Properties->Toggling height…
krowley Dec 12, 2012
e72432a
[TIMOB-11269] Kitchen sink:Base UI:Window Properties->Toggling height…
krowley Dec 13, 2012
12e837f
[TIMOB-11269] Kitchen sink:Base UI:Window Properties->Toggling height…
krowley Dec 14, 2012
3f17b9b
[TIMOB-11269] Kitchen sink:Base UI:Window Properties->Toggling height…
krowley Dec 14, 2012
b1d57dd
[TIMOB-11269] Kitchen sink:Base UI:Window Properties->Toggling height…
krowley Dec 14, 2012
00f9757
[TIMOB-11269] Kitchen sink:Base UI:Window Properties->Toggling height…
krowley Dec 14, 2012
9298b3c
[TIMOB-11269] Kitchen sink:Base UI:Window Properties->Toggling height…
krowley Dec 17, 2012
93d03b8
Revert "[TIMOB-11269] Kitchen sink:Base UI:Window Properties->Togglin…
krowley Dec 18, 2012
fb5ec32
[TIMOB-11269] Kitchen sink:Base UI:Window Properties->Toggling height…
krowley Dec 18, 2012
12e99a8
[TIMOB-11269] Kitchen sink:Base UI:Window Properties->Toggling height…
krowley Dec 19, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 15 additions & 4 deletions android/modules/ui/src/java/ti/modules/titanium/ui/TiUIActivityWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,14 +454,25 @@ public void processProperties(KrollDict d)
}

@Override
public void propertyChanged(String key, Object oldValue, Object newValue, KrollProxy proxy)
public void propertyChanged(String key, Object oldValue, Object newValue, KrollProxy windowProxy)
{
//
// Special case where where the windowProxy arg here does not match our underlying proxy.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo "where where"

// (windowProxy is TiBaseWindowProxy, but underlying proxy is ActivityWindowProxy).
// If that's true, then windowProxy has the new value but our proxy member does not,
// so we set it here. TIMOB-11269.
//
if (windowProxy != proxy)
{
proxy.setProperty(key, newValue);
}

if (key.equals(TiC.PROPERTY_BACKGROUND_IMAGE)) {
if (newValue != null) {
handleBackgroundImage(newValue, false);

} else {
handleBackgroundColor(proxy.getProperty(TiC.PROPERTY_BACKGROUND_COLOR), false);
handleBackgroundColor(windowProxy.getProperty(TiC.PROPERTY_BACKGROUND_COLOR), false);
}

} else if (key.equals(TiC.PROPERTY_BACKGROUND_COLOR)) {
Expand Down Expand Up @@ -502,7 +513,7 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
windowActivity.setTitle(title);

} else {
proxy.getActivity().setTitle(title);
windowProxy.getActivity().setTitle(title);
}

} else if (key.equals(TiC.PROPERTY_LAYOUT)) {
Expand All @@ -525,7 +536,7 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
handleWindowPixelFormat(TiConvert.toInt(newValue));

} else {
super.propertyChanged(key, oldValue, newValue, proxy);
super.propertyChanged(key, oldValue, newValue, windowProxy);
}
}

Expand Down