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 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];
-
   return item;
 }
 
 #pragma mark IKImageBrowserDelegate
 
 - (void)imageBrowser:(IKImageBrowserView*)browser
     cellWasDoubleClickedAtIndex:(NSUInteger)index {
   DesktopMediaPickerItem* item;
   if (browser == screenBrowser_)
     item = [screenItems_ objectAtIndex:index];
@@ skipping 70 matching lines @@
   base::scoped_nsobject<DesktopMediaPickerItem> item(
       [[DesktopMediaPickerItem alloc] initWithSourceId:source.id
                                               imageUID:++lastImageUID_
                                             imageTitle:imageTitle]);
 
   [items insertObject:item atIndex:index];
   [browser reloadData];
   if (sourceType == DesktopMediaID::TYPE_WEB_CONTENTS) {
     // Memorizing selection.
     [self setTabBrowserIndex:selectedIndex];
-  } else if (sourceType == DesktopMediaID::TYPE_SCREEN && [items count] == 1) {
-    // Preselect the first screen source.
-    [browser setSelectionIndexes:[NSIndexSet indexSetWithIndex:0]
-            byExtendingSelection:NO];
+  } else if (sourceType == DesktopMediaID::TYPE_SCREEN) {
+    if ([items count] == 1) {
+      // Preselect the first screen source.
+      [browser setSelectionIndexes:[NSIndexSet indexSetWithIndex:0]
+              byExtendingSelection:NO];
+    } else if ([items count] == 2) {
+      // Switch to multiple sources mode

[tapted, 2017/05/23 20:36:11]

nit: full stop at end

[qiangchen, 2017/05/23 21:33:17]

Done.

+      [browser
+          setCellSize:NSMakeSize(kMultipleScreenWidth, kMultipleScreenHeight)];
+    }
   }
 
   NSString* autoselectSource = base::SysUTF8ToNSString(
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kAutoSelectDesktopCaptureSource));
 
   if ([autoselectSource isEqualToString:imageTitle]) {
     [self reportResult:[item sourceID]];
     [self close];
   }
@@ skipping 14 matching lines @@
     [tabBrowser_ reloadData];
     [self setTabBrowserIndex:selectedIndex];
     return;
   }
 
   if ([[browser selectionIndexes] containsIndex:index]) {
     // Selected item was removed. Clear selection.
     [browser setSelectionIndexes:[NSIndexSet indexSet] byExtendingSelection:NO];
   }
   [items removeObjectAtIndex:index];
   [browser reloadData];

[tapted, 2017/05/23 20:36:11]

move this after the setCellSize call?

[qiangchen, 2017/05/23 21:33:17]

Done.

+  if (sourceType == DesktopMediaID::TYPE_SCREEN && [items count] == 1) {
+    [browser setCellSize:NSMakeSize(kSingleScreenWidth, kSingleScreenHeight)];
+  }

[tapted, 2017/05/23 20:36:11]

nit: curlies not needed

[qiangchen, 2017/05/23 21:33:17]

Done.

 }
 
 - (void)sourceMovedForList:(DesktopMediaList*)list
                       from:(int)oldIndex
                         to:(int)newIndex {
   DesktopMediaID::Type sourceType = [self sourceTypeForList:list];
   NSMutableArray* items = [self itemSetForType:sourceType];
   id browser = [self browserViewForType:sourceType];
   NSInteger selectedIndex = [self selectedIndexForType:sourceType];
   if (selectedIndex > oldIndex && selectedIndex <= newIndex)
@@ skipping 39 matching lines @@
 
   DesktopMediaPickerItem* item = [items objectAtIndex:index];
   [item setImageRepresentation:image];
   [browser reloadData];
 
   if (sourceType == DesktopMediaID::TYPE_WEB_CONTENTS)
     [self setTabBrowserIndex:selectedIndex];
 }
 
 @end  // @interface DesktopMediaPickerController