corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1192075 - Change copy in Settings for Zoomed View/ magnifying glass preference. r=mcomella

Browse Source
This commit is contained in:
dominique vincent
2015-08-20 13:44:18 -07:00
parent 312d879457
commit eb2443a480
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
layout/base/PositionedEventTargeting.cpp
View File

@@ -76,7 +76,7 @@ struct EventRadiusPrefs
bool mRegistered;
bool mTouchOnly;
bool mRepositionEventCoords;
bool mTouchClusterDetectionDisabled;
bool mTouchClusterDetectionEnabled;
uint32_t mLimitReadableSize;
};
@@ -125,8 +125,8 @@ GetPrefsFor(EventClassID aEventClassID)
nsPrintfCString repositionPref("ui.%s.radius.reposition", prefBranch);
Preferences::AddBoolVarCache(&prefs->mRepositionEventCoords, repositionPref.get(), false);
nsPrintfCString touchClusterPref("ui.zoomedview.disabled", prefBranch);
Preferences::AddBoolVarCache(&prefs->mTouchClusterDetectionDisabled, touchClusterPref.get(), true);
nsPrintfCString touchClusterPref("ui.zoomedview.enabled", prefBranch);
Preferences::AddBoolVarCache(&prefs->mTouchClusterDetectionEnabled, touchClusterPref.get(), false);
nsPrintfCString limitReadableSizePref("ui.zoomedview.limitReadableSize", prefBranch);
Preferences::AddUintVarCache(&prefs->mLimitReadableSize, limitReadableSizePref.get(), 8);
@@ -451,7 +451,7 @@ GetClosest(nsIFrame* aRoot, const nsPoint& aPointRelativeToRootFrame,
static bool
IsElementClickableAndReadable(nsIFrame* aFrame, WidgetGUIEvent* aEvent, const EventRadiusPrefs* aPrefs)
{
if (aPrefs->mTouchClusterDetectionDisabled) {
if (!aPrefs->mTouchClusterDetectionEnabled) {
return true;
}
@@ -578,7 +578,7 @@ FindFrameTargetedByInputEvent(WidgetGUIEvent* aEvent,
restrictToDescendants, clickableAncestor, candidates,
&elementsInCluster);
if (closestClickable) {
if ((!prefs->mTouchClusterDetectionDisabled && elementsInCluster > 1) ||
if ((prefs->mTouchClusterDetectionEnabled && elementsInCluster > 1) ||
(!IsElementClickableAndReadable(closestClickable, aEvent, prefs))) {
if (aEvent->mClass == eMouseEventClass) {
WidgetMouseEventBase* mouseEventBase = aEvent->AsMouseEventBase();