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 220 matching lines @@
   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,

[tapted, 2017/05/22 04:54:47]

Can you pass the correct size here by inspecting |screenList_|? It seems odd to
alter the size when each item is loaded.

[qiangchen, 2017/05/22 16:35:37]

Done.

                                               kSingleScreenHeight)] retain]);
   }
 
   if (windowList_) {
     windowBrowser_.reset([
         [self createImageBrowserWithSize:NSMakeSize(kThumbnailWidth,
                                                     kThumbnailHeight)] retain]);
   }
 
   if (tabList_) {
@@ skipping 300 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)];
+    } else {
+      [item setTitleHidden:YES];
+      [screenBrowser_
+          setCellSize:NSMakeSize(kSingleScreenWidth, kSingleScreenHeight)];
+    }
+  }

[tapted, 2017/05/22 04:54:47]

what if bowser != screenBrowser_? The old code would setTitleHidden:NO. Now it
doesn't.

[qiangchen, 2017/05/22 16:35:37]

For those cases, we never setTitleHidden to YES at any point, so it is safe.

 
   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