diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2016-06-22 23:22:41 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-22 23:22:41 -0700 |
commit | 415c18294693166472785459f9d5bc8be31b7033 (patch) | |
tree | cafcb78ba41920e1e2462d79284783d951d1e4f2 /platform/macos/app | |
parent | 4c87da6b8fc81e45e72d638024e49f230090945c (diff) | |
download | qtlocation-mapboxgl-415c18294693166472785459f9d5bc8be31b7033.tar.gz |
[ios, macos] Renamed overdraw to overdraw visualization (#5416)
A verb doesn’t make sense in this enum value. Instead, use a descriptive word for this effect and describe it in detail in the documentation comment.
Diffstat (limited to 'platform/macos/app')
-rw-r--r-- | platform/macos/app/Base.lproj/MainMenu.xib | 16 | ||||
-rw-r--r-- | platform/macos/app/MapDocument.m | 10 |
2 files changed, 13 insertions, 13 deletions
diff --git a/platform/macos/app/Base.lproj/MainMenu.xib b/platform/macos/app/Base.lproj/MainMenu.xib index ae10fe5d31..cee7d90aac 100644 --- a/platform/macos/app/Base.lproj/MainMenu.xib +++ b/platform/macos/app/Base.lproj/MainMenu.xib @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11129.15" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct"> <dependencies> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11129.15"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="NSApplication"> @@ -461,10 +461,10 @@ <action selector="toggleCollisionBoxes:" target="-1" id="EYa-7n-iWZ"/> </connections> </menuItem> - <menuItem title="Show Overdraws" id="hSX-Be-8xC"> + <menuItem title="Show Overdraw Visualization" id="hSX-Be-8xC"> <modifierMask key="keyEquivalentModifierMask"/> <connections> - <action selector="toggleOverdraws:" target="-1" id="usj-ug-upt"/> + <action selector="toggleOverdrawVisualization:" target="-1" id="usj-ug-upt"/> </connections> </menuItem> <menuItem isSeparatorItem="YES" id="2EG-Hp-4FA"/> @@ -591,7 +591,7 @@ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <rect key="contentRect" x="109" y="131" width="350" height="84"/> - <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/> + <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/> <view key="contentView" id="eA4-n3-qPe"> <rect key="frame" x="0.0" y="0.0" width="350" height="84"/> <autoresizingMask key="autoresizingMask"/> @@ -666,7 +666,7 @@ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" utility="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <rect key="contentRect" x="830" y="430" width="400" height="300"/> - <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/> + <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/> <view key="contentView" id="8ha-hw-zOD"> <rect key="frame" x="0.0" y="0.0" width="400" height="300"/> <autoresizingMask key="autoresizingMask"/> @@ -674,11 +674,11 @@ <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Q8b-0e-dLv"> <rect key="frame" x="-1" y="20" width="402" height="281"/> <clipView key="contentView" id="J9U-Yx-o2S"> - <rect key="frame" x="1" y="0.0" width="400" height="265"/> + <rect key="frame" x="1" y="0.0" width="400" height="280"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" autosaveColumns="NO" headerView="MAZ-Iq-hBi" id="Ato-Vu-HYT"> - <rect key="frame" x="0.0" y="0.0" width="423" height="242"/> + <rect key="frame" x="0.0" y="0.0" width="423" height="257"/> <autoresizingMask key="autoresizingMask"/> <size key="intercellSpacing" width="3" height="2"/> <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> diff --git a/platform/macos/app/MapDocument.m b/platform/macos/app/MapDocument.m index 8c3922e2d0..344565eaff 100644 --- a/platform/macos/app/MapDocument.m +++ b/platform/macos/app/MapDocument.m @@ -276,8 +276,8 @@ NS_ARRAY_OF(id <MGLAnnotation>) *MBXFlattenedShapes(NS_ARRAY_OF(id <MGLAnnotatio self.mapView.debugMask ^= MGLMapDebugCollisionBoxesMask; } -- (IBAction)toggleOverdraws:(id)sender { - self.mapView.debugMask ^= MGLMapDebugOverdrawsMask; +- (IBAction)toggleOverdrawVisualization:(id)sender { + self.mapView.debugMask ^= MGLMapDebugOverdrawVisualizationMask; } - (IBAction)showColorBuffer:(id)sender { @@ -604,9 +604,9 @@ NS_ARRAY_OF(id <MGLAnnotation>) *MBXFlattenedShapes(NS_ARRAY_OF(id <MGLAnnotatio menuItem.title = isShown ? @"Hide Collision Boxes" : @"Show Collision Boxes"; return YES; } - if (menuItem.action == @selector(toggleOverdraws:)) { - BOOL isShown = self.mapView.debugMask & MGLMapDebugOverdrawsMask; - menuItem.title = isShown ? @"Hide Overdraws" : @"Show Overdraws"; + if (menuItem.action == @selector(toggleOverdrawVisualization:)) { + BOOL isShown = self.mapView.debugMask & MGLMapDebugOverdrawVisualizationMask; + menuItem.title = isShown ? @"Hide Overdraw Visualization" : @"Show Overdraw Visualization"; return YES; } if (menuItem.action == @selector(showColorBuffer:)) { |