Dynamically Adjust Screen Item Size According To Item Count

chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 22 matching lines @@
 
 namespace {
 
 const CGFloat kInitialContentWidth = 620;
 const CGFloat kMinimumContentWidth = 500;
 const CGFloat kMinimumContentHeight = 390;
 const CGFloat kThumbnailWidth = 150;
 const CGFloat kThumbnailHeight = 150;
 const CGFloat kSingleScreenWidth = 300;
 const CGFloat kSingleScreenHeight = 300;
+const CGFloat kMultipleScreenWidth = 220;
+const CGFloat kMultipleScreenHeight = 220;
 const CGFloat kFramePadding = 20;
 const CGFloat kControlSpacing = 10;
 const CGFloat kExcessButtonPadding = 6;
 const CGFloat kRowHeight = 20;
 const CGFloat kRowWidth = 500;
 const CGFloat kIconWidth = 20;
 const CGFloat kPaddedWidth = kInitialContentWidth - (kFramePadding * 2);
 const CGFloat kFontSize = 13;
 
 NSString* const kIconId = @"icon";
@@ skipping 219 matching lines @@
   CGFloat controlWidth = NSWidth([sourceTypeControl_ frame]);
   CGFloat controlHeight = NSHeight([sourceTypeControl_ frame]);
   NSRect centerFrame = NSMakeRect((kInitialContentWidth - controlWidth) / 2,
                                   origin.y, controlWidth, controlHeight);
 
   [sourceTypeControl_ setFrame:NSIntegralRect(centerFrame)];
 }
 
 - (void)createSourceViewsAtOrigin:(NSPoint)origin {
   if (screenList_) {
-    screenBrowser_.reset([[self
-        createImageBrowserWithSize:NSMakeSize(kSingleScreenWidth,
-                                              kSingleScreenHeight)] retain]);
+    const bool is_single = screenList_->GetSourceCount() <= 1;
+    const CGFloat width = is_single ? kSingleScreenWidth : kMultipleScreenWidth;
+    const CGFloat height =
+        is_single ? kSingleScreenHeight : kMultipleScreenHeight;
+    screenBrowser_.reset(
+        [[self createImageBrowserWithSize:NSMakeSize(width, height)] retain]);
   }
 
   if (windowList_) {
     windowBrowser_.reset([
         [self createImageBrowserWithSize:NSMakeSize(kThumbnailWidth,
                                                     kThumbnailHeight)] retain]);
   }
 
   if (tabList_) {
     tabBrowser_.reset([[NSTableView alloc] initWithFrame:NSZeroRect]);
@@ skipping 299 matching lines @@
 }
 
 - (id)imageBrowser:(IKImageBrowserView*)browser itemAtIndex:(NSUInteger)index {
   DesktopMediaID::Type sourceType = [self sourceTypeForBrowser:browser];
   NSMutableArray* items = [self itemSetForType:sourceType];
   DesktopMediaPickerItem* item = [items objectAtIndex:index];
 
   // For screen source, if there is only one source, we can omit the label
   // "Entire Screen", because it is redundant with tab label "Your Entire
   // Screen".
-  [item setTitleHidden:browser == screenBrowser_ && [items count] == 1];
+  if (browser == screenBrowser_) {
+    if ([items count] > 1) {
+      [item setTitleHidden:NO];
+      [screenBrowser_
+          setCellSize:NSMakeSize(kMultipleScreenWidth, kMultipleScreenHeight)];

[tapted, 2017/05/22 23:54:01]

is this still needed? I don't think it should be here. In the general case, the
size of items determines the number of items the imagebrowser needs to show, and
the number of calls it makes to this delegate method. Changing the size could
trigger more calls to this method, or cause the imagebrowser to discard items it
had returned earlier (possibly even in a loop).

If you really need it, add a comment since it looks really odd. Like (if tested)
"if the user adds or removes a screen while the browser is showing then..."

[qiangchen, 2017/05/23 17:10:14]

The list is dynamically updated in another thread, so it is unsafe to rely on
the logic at initialization stage, as it is likely that at initialization, the
items are not ready yet.

I moved the code to list observer handler. So we can avoid repeatedly doing such
setting at the UI event.

+    } else {
+      [item setTitleHidden:YES];
+      [screenBrowser_
+          setCellSize:NSMakeSize(kSingleScreenWidth, kSingleScreenHeight)];
+    }
+  }
 
   return item;
 }
 
 #pragma mark IKImageBrowserDelegate
 
 - (void)imageBrowser:(IKImageBrowserView*)browser
     cellWasDoubleClickedAtIndex:(NSUInteger)index {
   DesktopMediaPickerItem* item;
   if (browser == screenBrowser_)
@@ skipping 169 matching lines @@
 
   DesktopMediaPickerItem* item = [items objectAtIndex:index];
   [item setImageRepresentation:image];
   [browser reloadData];
 
   if (sourceType == DesktopMediaID::TYPE_WEB_CONTENTS)
     [self setTabBrowserIndex:selectedIndex];
 }
 
 @end  // @interface DesktopMediaPickerController