Changeset 61854 in webkit

Timestamp:

Jun 25, 2010 5:41:45 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-06-25 Lucas De Marchi <​lucas.demarchi@profusion.mobi>

Reviewed by Kenneth Rohde Christiansen.

[EFL] Use a descriptive string in FileChooser when multiple files can
be selected.
​https://bugs.webkit.org/show_bug.cgi?id=40943

EFL port has no tests yet, so no new tests.

• platform/efl/FileChooserEfl.cpp: (WebCore::FileChooser::basenameForWidth):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/efl/FileChooserEfl.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-25  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [EFL] Use a descriptive string in FileChooser when multiple files can
+        be selected.
+        https://bugs.webkit.org/show_bug.cgi?id=40943
+
+        EFL port has no tests yet, so no new tests.
+
+        * platform/efl/FileChooserEfl.cpp:
+        (WebCore::FileChooser::basenameForWidth):
+
 2010-06-25  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/WebCore/platform/efl/FileChooserEfl.cpp

@@ -32 +32 @@
 
 #include "LocalizedStrings.h"
+#include "StringTruncator.h"
 
 namespace WebCore {
@@ -40 +41 @@
         return String();
 
+    String string;
     if (m_filenames.isEmpty())
-        return fileButtonNoFileSelectedLabel();
+        string = fileButtonNoFileSelectedLabel();
+    else if (m_filenames.size() == 1)
+        string = m_filenames[0];
+    else
+        return StringTruncator::rightTruncate(multipleFileUploadText(m_filenames.size()), width, font, false);
+
+    return StringTruncator::centerTruncate(string, static_cast<float>(width), font, false);
 }