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 960746 - Disable navigation buttons when they are hit until page load. r=lucasr

Browse Source
This commit is contained in:
Michael Comella 2014-09-11 12:06:40 -07:00
parent 52161380b6
commit d9a7d5f709
1 changed files with 82 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
mobile/android/base/toolbar/BrowserToolbarTabletBase.java
View File

@ -10,6 +10,7 @@ import java.util.Arrays;
import org.mozilla.gecko.R;
import org.mozilla.gecko.Tab;
import org.mozilla.gecko.Tabs;
import org.mozilla.gecko.Tabs.TabEvents;
import org.mozilla.gecko.animation.PropertyAnimator;
import org.mozilla.gecko.animation.ViewHelper;
@ -19,7 +20,6 @@ import android.util.AttributeSet;
import android.view.View;
import android.view.animation.AccelerateInterpolator;
import android.view.animation.Interpolator;
import android.widget.Button;
import android.widget.ImageButton;
import android.widget.LinearLayout;
@ -37,7 +37,12 @@ abstract class BrowserToolbarTabletBase extends BrowserToolbar {
protected final LinearLayout actionItemBar;
protected final BackButton backButton;
private final OnClickListener backButtonOnClickListener;
private final OnLongClickListener backButtonOnLongClickListener;
protected final ForwardButton forwardButton;
private final OnClickListener forwardButtonOnClickListener;
private final OnLongClickListener forwardButtonOnLongClickListener;
private final Interpolator buttonsInterpolator = new AccelerateInterpolator();
@ -52,39 +57,57 @@ abstract class BrowserToolbarTabletBase extends BrowserToolbar {
setButtonEnabled(backButton, false);
forwardButton = (ForwardButton) findViewById(R.id.forward);
setButtonEnabled(forwardButton, false);
initButtonListeners();
backButtonOnClickListener = new BackButtonOnClickListener();
backButtonOnLongClickListener = new BackButtonOnLongClickListener();
forwardButtonOnClickListener = new ForwardButtonOnClickListener();
forwardButtonOnLongClickListener = new ForwardButtonOnLongClickListener();
setNavigationButtonListeners(true);
focusOrder.addAll(Arrays.asList(tabsButton, (View) backButton, (View) forwardButton, this));
focusOrder.addAll(urlDisplayLayout.getFocusOrder());
focusOrder.addAll(Arrays.asList(actionItemBar, menuButton));
}
private void initButtonListeners() {
backButton.setOnClickListener(new Button.OnClickListener() {
@Override
public void onClick(View view) {
Tabs.getInstance().getSelectedTab().doBack();
}
});
backButton.setOnLongClickListener(new Button.OnLongClickListener() {
@Override
public boolean onLongClick(View view) {
return Tabs.getInstance().getSelectedTab().showBackHistory();
}
});
/**
* Enables or disables the click listeners on the back and forward buttons.
*
* This method is useful to remove and later add the listeners when a navigation button is hit
* because calling `browser.go*()` twice in succession can cause the UI buttons to get out of
* sync with gecko's browser state (bug 960746).
*
* @param disabled True if the listeners should be removed, false for them to be added.
*/
private void setNavigationButtonListeners(final boolean enabled) {
if (enabled) {
backButton.setOnClickListener(backButtonOnClickListener);
backButton.setOnLongClickListener(backButtonOnLongClickListener);
forwardButton.setOnClickListener(new Button.OnClickListener() {
@Override
public void onClick(View view) {
Tabs.getInstance().getSelectedTab().doForward();
}
});
forwardButton.setOnLongClickListener(new Button.OnLongClickListener() {
@Override
public boolean onLongClick(View view) {
return Tabs.getInstance().getSelectedTab().showForwardHistory();
}
});
forwardButton.setOnClickListener(forwardButtonOnClickListener);
forwardButton.setOnLongClickListener(forwardButtonOnLongClickListener);
} else {
backButton.setOnClickListener(null);
backButton.setOnLongClickListener(null);
forwardButton.setOnClickListener(null);
forwardButton.setOnLongClickListener(null);
}
}
@Override
public void onTabChanged(final Tab tab, final Tabs.TabEvents msg, final Object data) {
// STOP appears to be the first page load event where async nav issues are prevented,
// SELECTED is for switching tabs, and LOAD_ERROR is called when a JavaScript exception
// is thrown while loading a URI, which can prevent STOP from ever being called.
//
// See `setNavigationButtonListeners` javadoc for more information.
if (msg == TabEvents.STOP ||
msg == TabEvents.SELECTED ||
msg == TabEvents.LOAD_ERROR) {
setNavigationButtonListeners(true);
}
super.onTabChanged(tab, msg, data);
}
@Override
@ -164,4 +187,36 @@ abstract class BrowserToolbarTabletBase extends BrowserToolbar {
button.setEnabled(enabled);
}
private class BackButtonOnClickListener implements OnClickListener {
@Override
public void onClick(final View view) {
setNavigationButtonListeners(false);
Tabs.getInstance().getSelectedTab().doBack();
}
}
private class BackButtonOnLongClickListener implements OnLongClickListener {
@Override
public boolean onLongClick(final View view) {
setNavigationButtonListeners(false);
return Tabs.getInstance().getSelectedTab().showBackHistory();
}
}
private class ForwardButtonOnClickListener implements OnClickListener {
@Override
public void onClick(final View view) {
setNavigationButtonListeners(false);
Tabs.getInstance().getSelectedTab().doForward();
}
}
private class ForwardButtonOnLongClickListener implements OnLongClickListener {
@Override
public boolean onLongClick(final View view) {
setNavigationButtonListeners(false);
return Tabs.getInstance().getSelectedTab().showForwardHistory();
}
}
}