Changeset 265061 in webkit

Timestamp:

Jul 29, 2020 3:00:20 PM (4 years ago)

Author:

Simon Fraser

Message:

Make the lock icon update correctly in MiniBrowser
​https://bugs.webkit.org/show_bug.cgi?id=214933

Reviewed by Alex Christensen.

Various fixes to the MiniBrowser lock icon. Set the initial state to unlocked in the XIB.
Dim the icon when there is no certificate to display. Dim it and show unlocked for WK1 windows.

• MiniBrowser/mac/BrowserWindow.xib:
• MiniBrowser/mac/BrowserWindowController.h:
• MiniBrowser/mac/BrowserWindowController.m:

(-[BrowserWindowController showCertificate:]):

• MiniBrowser/mac/WK1BrowserWindowController.m:

(-[WK1BrowserWindowController validateUserInterfaceItem:]):

• MiniBrowser/mac/WK2BrowserWindowController.m:

(-[WK2BrowserWindowController validateUserInterfaceItem:]):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• MiniBrowser/mac/BrowserWindow.xib (modified) (6 diffs)
• MiniBrowser/mac/BrowserWindowController.h (modified) (1 diff)
• MiniBrowser/mac/BrowserWindowController.m (modified) (1 diff)
• MiniBrowser/mac/WK1BrowserWindowController.m (modified) (1 diff)
• MiniBrowser/mac/WK2BrowserWindowController.m (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-07-29  Simon Fraser  <simon.fraser@apple.com>
+
+        Make the lock icon update correctly in MiniBrowser
+        https://bugs.webkit.org/show_bug.cgi?id=214933
+
+        Reviewed by Alex Christensen.
+
+        Various fixes to the MiniBrowser lock icon. Set the initial state to unlocked in the XIB.
+        Dim the icon when there is no certificate to display. Dim it and show unlocked for WK1 windows.
+
+        * MiniBrowser/mac/BrowserWindow.xib:
+        * MiniBrowser/mac/BrowserWindowController.h:
+        * MiniBrowser/mac/BrowserWindowController.m:
+        (-[BrowserWindowController showCertificate:]):
+        * MiniBrowser/mac/WK1BrowserWindowController.m:
+        (-[WK1BrowserWindowController validateUserInterfaceItem:]):
+        * MiniBrowser/mac/WK2BrowserWindowController.m:
+        (-[WK2BrowserWindowController validateUserInterfaceItem:]):
+
 2020-07-29  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/MiniBrowser/mac/BrowserWindow.xib

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17132" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16096" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17132"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16096"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -11 +11 @@
                 <outlet property="containerView" destination="9" id="37"/>
                 <outlet property="forwardButton" destination="42" id="47"/>
+                <outlet property="lockButton" destination="mWN-r5-XQb" id="49"/>
                 <outlet property="progressIndicator" destination="21" id="33"/>
                 <outlet property="reloadButton" destination="23" id="34"/>
-                <outlet property="lockButton" destination="mWN-r5-XQb" id="49"/>
                 <outlet property="share" destination="1hB-AH-eUl" id="si4-8e-DsM"/>
                 <outlet property="toggleUseShrinkToFitButton" destination="82" id="9w7-AB-Ye3"/>
@@ -27 +27 @@
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="517" y="330" width="776" height="608"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" id="2">
                 <rect key="frame" x="0.0" y="0.0" width="776" height="608"/>
@@ -88 +88 @@
                         </button>
                     </toolbarItem>
-                    <toolbarItem implicitItemIdentifier="F9C3B2C4-B22D-4E12-92BC-EA326711BBC1" label="Lock" paletteLabel="Lock" image="NSLockLockedTemplate" id="Ky3-6Y-3U1" userLabel="Lock" customClass="MBToolbarItem">
+                    <toolbarItem implicitItemIdentifier="F9C3B2C4-B22D-4E12-92BC-EA326711BBC1" label="Lock" paletteLabel="Lock" image="NSLockUnlockedTemplate" id="Ky3-6Y-3U1" userLabel="Lock" customClass="MBToolbarItem">
                         <nil key="toolTip"/>
                         <size key="minSize" width="29" height="25"/>
@@ -95 +95 @@
                             <rect key="frame" x="2" y="14" width="29" height="25"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                            <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSLockLockedTemplate" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="iRv-ey-QZe">
+                            <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSLockUnlockedTemplate" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="iRv-ey-QZe">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
@@ -178 +178 @@
     </objects>
     <resources>
-        <image name="NSEnterFullScreenTemplate" width="16" height="15"/>
-        <image name="NSLockLockedTemplate" width="10" height="14"/>
-        <image name="NSGoLeftTemplate" width="10" height="14"/>
-        <image name="NSGoRightTemplate" width="10" height="14"/>
-        <image name="NSRefreshTemplate" width="14" height="16"/>
-        <image name="NSShareTemplate" width="15" height="17"/>
+        <image name="NSEnterFullScreenTemplate" width="15" height="15"/>
+        <image name="NSGoLeftTemplate" width="9" height="12"/>
+        <image name="NSGoRightTemplate" width="9" height="12"/>
+        <image name="NSLockUnlockedTemplate" width="10" height="14"/>
+        <image name="NSRefreshTemplate" width="11" height="15"/>
+        <image name="NSShareTemplate" width="11" height="16"/>
     </resources>
 </document>

trunk/Tools/MiniBrowser/mac/BrowserWindowController.h

@@ -54 +54 @@
 - (IBAction)share:(id)sender;
 - (IBAction)reload:(id)sender;
+- (IBAction)showCertificate:(id)sender;
 - (IBAction)forceRepaint:(id)sender;
 - (IBAction)goBack:(id)sender;

trunk/Tools/MiniBrowser/mac/BrowserWindowController.m

@@ -104 +104 @@
 }
 
+- (IBAction)showCertificate:(id)sender
+{
+    [self doesNotRecognizeSelector:_cmd];
+}
+
 - (IBAction)forceRepaint:(id)sender
 {

trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m

@@ -192 +192 @@
     if (action == @selector(goBack:))
         return [_webView canGoBack];
-    
+
     if (action == @selector(goForward:))
         return [_webView canGoForward];
-    
+
+    if (action == @selector(showCertificate:))
+        return NO;
+
     return YES;
 }

trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m

@@ -396 +396 @@
     if (action == @selector(goBack:) || action == @selector(goForward:))
         return [_webView validateUserInterfaceItem:item];
+
+    if (action == @selector(showCertificate:))
+        return _webView.serverTrust != nil;
 
     return YES;