Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Do not use curved tooltips on the tray #1550

Closed
MortimerGoro wants to merge 1 commit into from
Closed

Do not use curved tooltips on the tray #1550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/views/UIButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ private enum State {
private @IdRes int mActiveModeTintColorListRes;
private TooltipWidget mTooltipView;
private String mTooltipText;
private boolean mCurvedTooltip = true;
private State mState;
private int mTooltipDelay;
private float mTooltipDensity;
Expand Down Expand Up @@ -93,6 +94,10 @@ public void setTooltip(String text) {
mTooltipView.setText(text);
}

public void setCurvedTooltip(boolean aValue) {
mCurvedTooltip = aValue;
}

@Override
public boolean onHoverEvent(MotionEvent event) {
if (getTooltip() != null) {
Expand Down
5 changes: 5 additions & 0 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TrayWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ private void initialize(Context aContext) {

mPrivateButton = findViewById(R.id.privateButton);
mPrivateButton.setOnHoverListener(mButtonScaleHoverListener);
mPrivateButton.setCurvedTooltip(false);
mPrivateButton.setOnClickListener(view -> {
if (mAudio != null) {
mAudio.playSound(AudioEngine.Sound.CLICK);
Expand All @@ -81,8 +82,10 @@ private void initialize(Context aContext) {
view.requestFocusFromTouch();
});


mSettingsButton = findViewById(R.id.settingsButton);
mSettingsButton.setOnHoverListener(mButtonScaleHoverListener);
mSettingsButton.setCurvedTooltip(false);
mSettingsButton.setOnClickListener(view -> {
if (mAudio != null) {
mAudio.playSound(AudioEngine.Sound.CLICK);
Expand All @@ -95,6 +98,7 @@ private void initialize(Context aContext) {

mBookmarksButton = findViewById(R.id.bookmarksButton);
mBookmarksButton.setOnHoverListener(mButtonScaleHoverListener);
mBookmarksButton.setCurvedTooltip(false);
mBookmarksButton.setOnClickListener(view -> {
if (mAudio != null) {
mAudio.playSound(AudioEngine.Sound.CLICK);
Expand All @@ -106,6 +110,7 @@ private void initialize(Context aContext) {

UIButton addWindowButton = findViewById(R.id.addwindowButton);
addWindowButton.setOnHoverListener(mButtonScaleHoverListener);
addWindowButton.setCurvedTooltip(false);
addWindowButton.setOnClickListener(view -> {
if (mAudio != null) {
mAudio.playSound(AudioEngine.Sound.CLICK);
Expand Down