Skip to content

Commit 2760f2f

Browse files
osyosy
authored
Merge pull request #192 from utmapp/improve-contrast
Improve toolbar contrast and enable pointer highlight effects
2 parents db27be9 + 530f0c0 commit 2760f2f

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

‎UTM/Base.lproj/Main.storyboard

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<rect key="frame" x="65" y="40" width="20" height="20"/>
6565
<color key="color" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
6666
</activityIndicatorView>
67-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="byz-Gf-XHC">
67+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="byz-Gf-XHC">
6868
<rect key="frame" x="0.0" y="0.0" width="150" height="100"/>
6969
<accessibility key="accessibilityConfiguration" hint="Start" label="Start">
7070
<accessibilityTraits key="traits" button="YES"/>
@@ -100,7 +100,7 @@
100100
</view>
101101
<blurEffect style="light"/>
102102
</visualEffectView>
103-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="detailDisclosure" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LpV-bC-fzU">
103+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="detailDisclosure" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LpV-bC-fzU">
104104
<rect key="frame" x="121" y="112" width="25" height="24"/>
105105
<connections>
106106
<segue destination="fxo-tK-lAq" kind="presentation" identifier="editVMConfig" modalPresentationStyle="formSheet" id="3tV-yy-VRS"/>
@@ -2132,7 +2132,7 @@
21322132
<constraint firstAttribute="height" constant="50" id="M4a-NF-QgF"/>
21332133
</constraints>
21342134
</activityIndicatorView>
2135-
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a0a-Yw-GZc">
2135+
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="a0a-Yw-GZc">
21362136
<rect key="frame" x="162.66666666666666" y="381" width="50" height="50"/>
21372137
<state key="normal" image="Resume Icon"/>
21382138
<connections>
@@ -2148,7 +2148,7 @@
21482148
</constraints>
21492149
</view>
21502150
<vibrancyEffect>
2151-
<blurEffect style="regular"/>
2151+
<blurEffect style="dark"/>
21522152
</vibrancyEffect>
21532153
</visualEffectView>
21542154
</subviews>
@@ -2159,7 +2159,7 @@
21592159
<constraint firstItem="0wd-zl-ieP" firstAttribute="leading" secondItem="Ebe-6D-2qI" secondAttribute="leading" id="ek3-bx-slP"/>
21602160
</constraints>
21612161
</view>
2162-
<blurEffect style="regular"/>
2162+
<blurEffect style="dark"/>
21632163
</visualEffectView>
21642164
<visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VFv-zJ-H5K" userLabel="Toolbar Accessory View">
21652165
<rect key="frame" x="0.0" y="0.0" width="375" height="89"/>
@@ -2176,7 +2176,7 @@
21762176
<stackView opaque="NO" contentMode="scaleToFill" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="Z0A-c7-3p0">
21772177
<rect key="frame" x="215" y="51" width="144" height="30"/>
21782178
<subviews>
2179-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="m9f-Az-rlH">
2179+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="m9f-Az-rlH">
21802180
<rect key="frame" x="0.0" y="0.0" width="30" height="30"/>
21812181
<accessibility key="accessibilityConfiguration" label="Zoom"/>
21822182
<constraints>
@@ -2189,7 +2189,7 @@
21892189
<action selector="changeDisplayZoom:" destination="ckC-eO-gxn" eventType="touchUpInside" id="Q0W-5s-X8Y"/>
21902190
</connections>
21912191
</button>
2192-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Grb-jH-Oxk">
2192+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Grb-jH-Oxk">
21932193
<rect key="frame" x="38" y="0.0" width="30" height="30"/>
21942194
<accessibility key="accessibilityConfiguration" label="Keyboard"/>
21952195
<constraints>
@@ -2201,7 +2201,7 @@
22012201
<action selector="showKeyboardButton:" destination="ckC-eO-gxn" eventType="touchUpInside" id="Zd4-8I-vO3"/>
22022202
</connections>
22032203
</button>
2204-
<button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ESi-T5-nUB">
2204+
<button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ESi-T5-nUB">
22052205
<rect key="frame" x="76" y="0.0" width="30" height="30"/>
22062206
<accessibility key="accessibilityConfiguration" label="Settings"/>
22072207
<constraints>
@@ -2210,7 +2210,7 @@
22102210
</constraints>
22112211
<state key="normal" image="Toolbar Settings"/>
22122212
</button>
2213-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="M5V-xj-Rzw">
2213+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="M5V-xj-Rzw">
22142214
<rect key="frame" x="114" y="0.0" width="30" height="30"/>
22152215
<accessibility key="accessibilityConfiguration" label="Hide Toolbar"/>
22162216
<constraints>
@@ -2229,7 +2229,7 @@
22292229
<stackView opaque="NO" contentMode="scaleToFill" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="nJG-8W-K7c">
22302230
<rect key="frame" x="16" y="51" width="106" height="30"/>
22312231
<subviews>
2232-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0Wo-4E-exJ">
2232+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0Wo-4E-exJ">
22332233
<rect key="frame" x="0.0" y="0.0" width="30" height="30"/>
22342234
<accessibility key="accessibilityConfiguration" label="Power"/>
22352235
<constraints>
@@ -2242,7 +2242,7 @@
22422242
<action selector="powerPressed:" destination="ckC-eO-gxn" eventType="touchUpInside" id="89w-f5-kg9"/>
22432243
</connections>
22442244
</button>
2245-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bjd-4T-OVm">
2245+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bjd-4T-OVm">
22462246
<rect key="frame" x="38" y="0.0" width="30" height="30"/>
22472247
<accessibility key="accessibilityConfiguration" label="Pause"/>
22482248
<constraints>
@@ -2255,7 +2255,7 @@
22552255
<action selector="pauseResumePressed:" destination="ckC-eO-gxn" eventType="touchUpInside" id="DYI-VN-mcQ"/>
22562256
</connections>
22572257
</button>
2258-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HpT-OM-Xpa">
2258+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HpT-OM-Xpa">
22592259
<rect key="frame" x="76" y="0.0" width="30" height="30"/>
22602260
<accessibility key="accessibilityConfiguration" label="Back"/>
22612261
<constraints>
@@ -2281,7 +2281,7 @@
22812281
</constraints>
22822282
</view>
22832283
<vibrancyEffect>
2284-
<blurEffect style="light"/>
2284+
<blurEffect style="dark"/>
22852285
</vibrancyEffect>
22862286
</visualEffectView>
22872287
</subviews>

‎Views/VMDisplayMetalViewController.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,10 @@ - (NSInteger)integerForSetting:(NSString *)key {
228228

229229
#pragma mark - Toolbar actions
230230

231+
- (UIStatusBarStyle)preferredStatusBarStyle {
232+
return UIStatusBarStyleLightContent;
233+
}
234+
231235
- (void)hideToolbar {
232236
[UIView transitionWithView:self.view duration:0.3 options:UIViewAnimationOptionTransitionCrossDissolve animations:^{
233237
self.toolbarAccessoryView.hidden = YES;

0 commit comments

Comments
 (0)