Title: [172343] trunk/Source/WebKit2
- Revision
- 172343
- Author
- [email protected]
- Date
- 2014-08-08 09:18:46 -0700 (Fri, 08 Aug 2014)
Log Message
Additional items added to selection services menus are misaligned
https://bugs.webkit.org/show_bug.cgi?id=135747
<rdar://problem/17933167>
Reviewed by Brady Eidson.
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::setupServicesMenu):
Use NSSharingServicePickerStyleRollover for the rollover image services menu;
use NSSharingServicePickerStyleTextSelection for the selection services menu.
Set NSMenu's showsStateColumn to YES for selection services menus, so that
other items added to the menu line up correctly.
Remove an unncessary .get()
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (172342 => 172343)
--- trunk/Source/WebKit2/ChangeLog 2014-08-08 12:57:19 UTC (rev 172342)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-08 16:18:46 UTC (rev 172343)
@@ -1,3 +1,21 @@
+2014-08-08 Timothy Horton <[email protected]>
+
+ Additional items added to selection services menus are misaligned
+ https://bugs.webkit.org/show_bug.cgi?id=135747
+ <rdar://problem/17933167>
+
+ Reviewed by Brady Eidson.
+
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::WebContextMenuProxyMac::setupServicesMenu):
+ Use NSSharingServicePickerStyleRollover for the rollover image services menu;
+ use NSSharingServicePickerStyleTextSelection for the selection services menu.
+
+ Set NSMenu's showsStateColumn to YES for selection services menus, so that
+ other items added to the menu line up correctly.
+
+ Remove an unncessary .get()
+
2014-08-08 Grzegorz Czajkowski <[email protected]>
[EFL] Remove unnecessary ewk_private.h includes
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (172342 => 172343)
--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2014-08-08 12:57:19 UTC (rev 172342)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2014-08-08 16:18:46 UTC (rev 172343)
@@ -372,8 +372,9 @@
{
RetainPtr<NSSharingServicePicker> picker;
bool includeEditorServices = context.controlledDataIsEditable();
+ bool hasControlledImage = !context.controlledImageHandle().isNull();
NSArray *items = nil;
- if (!context.controlledImageHandle().isNull()) {
+ if (hasControlledImage) {
RefPtr<ShareableBitmap> image = ShareableBitmap::create(context.controlledImageHandle());
if (!image)
return;
@@ -392,20 +393,23 @@
}
picker = adoptNS([[NSSharingServicePicker alloc] initWithItems:items]);
- [picker setStyle:NSSharingServicePickerStyleRollover];
+ [picker setStyle:hasControlledImage ? NSSharingServicePickerStyleRollover : NSSharingServicePickerStyleTextSelection];
[picker setDelegate:[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate]];
[[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setPicker:picker.get()];
[[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setIncludeEditorServices:includeEditorServices];
m_servicesMenu = [picker menu];
+ if (!hasControlledImage)
+ [m_servicesMenu setShowsStateColumn:YES];
+
// Explicitly add a menu item for each telephone number that is in the selection.
const Vector<String>& selectedTelephoneNumbers = context.selectedTelephoneNumbers();
if (!selectedTelephoneNumbers.isEmpty()) {
[m_servicesMenu.get() addItem:[NSMenuItem separatorItem]];
for (auto& telephoneNumber : selectedTelephoneNumbers) {
if (NSMenuItem *item = menuItemForTelephoneNumber(telephoneNumber))
- [m_servicesMenu.get() addItem:item];
+ [m_servicesMenu addItem:item];
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
