wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1116615 - Only update the GeckoMenuItem View if property setter changes a value r=rnewman

Browse Source
This commit is contained in:
Mark Finkle 2014-12-31 01:37:37 -05:00
parent 3464f60a7b
commit 6810b71896
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
mobile/android/base/menu/GeckoMenuItem.java
View File

@ -10,6 +10,7 @@ import org.mozilla.gecko.widget.GeckoActionProvider;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.text.TextUtils;
import android.view.ActionProvider;
import android.view.ContextMenu;
import android.view.MenuItem;
@ -244,36 +245,46 @@ public class GeckoMenuItem implements MenuItem {
@Override
public MenuItem setCheckable(boolean checkable) {
mCheckable = checkable;
mMenu.onItemChanged(this);
if (mCheckable != checkable) {
mCheckable = checkable;
mMenu.onItemChanged(this);
}
return this;
}
@Override
public MenuItem setChecked(boolean checked) {
mChecked = checked;
mMenu.onItemChanged(this);
if (mChecked != checked) {
mChecked = checked;
mMenu.onItemChanged(this);
}
return this;
}
@Override
public MenuItem setEnabled(boolean enabled) {
mEnabled = enabled;
mMenu.onItemChanged(this);
if (mEnabled != enabled) {
mEnabled = enabled;
mMenu.onItemChanged(this);
}
return this;
}
@Override
public MenuItem setIcon(Drawable icon) {
mIcon = icon;
mMenu.onItemChanged(this);
if (mIcon != icon) {
mIcon = icon;
mMenu.onItemChanged(this);
}
return this;
}
@Override
public MenuItem setIcon(int iconRes) {
mIconRes = iconRes;
mMenu.onItemChanged(this);
if (mIconRes != iconRes) {
mIconRes = iconRes;
mMenu.onItemChanged(this);
}
return this;
}
@ -354,16 +365,17 @@ public class GeckoMenuItem implements MenuItem {
@Override
public MenuItem setTitle(CharSequence title) {
mTitle = title;
mMenu.onItemChanged(this);
if (!TextUtils.equals(mTitle, title)) {
mTitle = title;
mMenu.onItemChanged(this);
}
return this;
}
@Override
public MenuItem setTitle(int title) {
mTitle = mMenu.getResources().getString(title);
mMenu.onItemChanged(this);
return this;
CharSequence newTitle = mMenu.getResources().getString(title);
return setTitle(newTitle);
}
@Override
@ -374,8 +386,10 @@ public class GeckoMenuItem implements MenuItem {
@Override
public MenuItem setVisible(boolean visible) {
mVisible = visible;
mMenu.onItemChanged(this);
if (mVisible != visible) {
mVisible = visible;
mMenu.onItemChanged(this);
}
return this;
}