Allow reload button to be clicked (fixes #313)

radiant-player · Jun 3, 2015 · 17a42d4 · 17a42d4
1 parent 967d172
commit 17a42d4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/radiant-player-mac/AppDelegate.m b/radiant-player-mac/AppDelegate.m
@@ -567,6 +567,7 @@ - (void) load:(id)sender
     [loadingMessage setHidden:NO];
     [loadingMessage setStringValue:@"Loading Google Play Music..."];
     [reloadButton setHidden:YES];
+    [[reloadButton superview] setHidden:NO];
 
     NSURL *url = [NSURL URLWithString:@"https://play.google.com/music"];
     NSURLRequest *request = [NSURLRequest requestWithURL:url];
@@ -897,6 +898,7 @@ - (void)webView:(WebView *)sender didFailLoadWithError:(NSError *)error forFrame
         [loadingIndicator stopAnimation:self];
         [loadingMessage setStringValue:reason];
         [reloadButton setHidden:NO];
+        [[reloadButton superview] setHidden:NO];
     }
 }
 
@@ -909,6 +911,7 @@ - (void)webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)err
         [loadingIndicator stopAnimation:self];
         [loadingMessage setStringValue:reason];
         [reloadButton setHidden:NO];
+        [[reloadButton superview] setHidden:NO];
     }
 }
 
@@ -920,6 +923,7 @@ - (void)webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame
         [loadingIndicator setHidden:YES];
         [loadingMessage setHidden:YES];
         [reloadButton setHidden:YES];
+        [[reloadButton superview] setHidden:YES];
     }
 }
 

diff --git a/radiant-player-mac/en.lproj/MainMenu.xib b/radiant-player-mac/en.lproj/MainMenu.xib
@@ -315,6 +315,15 @@
                 <rect key="frame" x="0.0" y="0.0" width="942" height="702"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
+                    <webView identifier="myWebView" translatesAutoresizingMaskIntoConstraints="NO" id="536" customClass="CustomWebView">
+                        <rect key="frame" x="0.0" y="0.0" width="942" height="702"/>
+                        <constraints>
+                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="655"/>
+                        </constraints>
+                        <webPreferences key="preferences" defaultFontSize="12" defaultFixedFontSize="12">
+                            <nil key="identifier"/>
+                        </webPreferences>
+                    </webView>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="mf9-a3-xaf">
                         <rect key="frame" x="0.0" y="0.0" width="942" height="702"/>
                         <subviews>
@@ -350,15 +359,6 @@
                             <constraint firstAttribute="trailing" secondItem="qBi-0j-ssN" secondAttribute="trailing" constant="80" id="qb3-kD-KM5"/>
                         </constraints>
                     </customView>
-                    <webView identifier="myWebView" translatesAutoresizingMaskIntoConstraints="NO" id="536" customClass="CustomWebView">
-                        <rect key="frame" x="0.0" y="0.0" width="942" height="702"/>
-                        <constraints>
-                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="655"/>
-                        </constraints>
-                        <webPreferences key="preferences" defaultFontSize="12" defaultFixedFontSize="12">
-                            <nil key="identifier"/>
-                        </webPreferences>
-                    </webView>
                 </subviews>
                 <constraints>
                     <constraint firstItem="536" firstAttribute="trailing" secondItem="372" secondAttribute="trailing" id="586"/>