Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(466)

Unified Diff: ui/app_list/views/search_box_view.cc

Issue 493293003: Use a background for the main search box in the experimental app list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/views/app_list_main_view.cc ('k') | ui/app_list/views/start_page_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/search_box_view.cc
diff --git a/ui/app_list/views/search_box_view.cc b/ui/app_list/views/search_box_view.cc
index 7f0c4bed1f50fcac6b2426981cc8881fc8a5c9a1..f69ebf6abbea7736171db0100ed7abbcef6a50e6 100644
--- a/ui/app_list/views/search_box_view.cc
+++ b/ui/app_list/views/search_box_view.cc
@@ -7,6 +7,7 @@
#include <algorithm>
#include "ui/app_list/app_list_model.h"
+#include "ui/app_list/app_list_switches.h"
#include "ui/app_list/app_list_view_delegate.h"
#include "ui/app_list/search_box_model.h"
#include "ui/app_list/speech_ui_model.h"
@@ -14,6 +15,7 @@
#include "ui/app_list/views/search_box_view_delegate.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/events/event.h"
+#include "ui/gfx/canvas.h"
#include "ui/resources/grit/ui_resources.h"
#include "ui/views/border.h"
#include "ui/views/controls/button/image_button.h"
@@ -39,6 +41,40 @@ const SkColor kHintTextColor = SkColorSetRGB(0xA0, 0xA0, 0xA0);
const int kMenuYOffsetFromButton = -4;
const int kMenuXOffsetFromButton = -7;
+// Experimental app list constants.
+const int kExperimentalSearchBoxHeight = 37;
+
+const int kBackgroundBorderWidth = 1;
+const int kBackgroundBorderBottomWidth = 2;
+const int kBackgroundBorderCornerRadius = 2;
+const SkColor kBackgroundBorderColor = SkColorSetRGB(0xEE, 0xEE, 0xEE);
+
+// A background that paints a solid white rounded rect with a thin grey border.
+class SearchBoxBackground : public views::Background {
+ public:
+ SearchBoxBackground() {}
+ virtual ~SearchBoxBackground() {}
+
+ private:
+ // views::Background overrides:
+ virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE {
+ gfx::Rect bounds = view->GetContentsBounds();
+
+ SkPaint paint;
+ paint.setFlags(SkPaint::kAntiAlias_Flag);
+ paint.setColor(kBackgroundBorderColor);
+ canvas->DrawRoundRect(bounds, kBackgroundBorderCornerRadius, paint);
+ bounds.Inset(kBackgroundBorderWidth,
+ kBackgroundBorderWidth,
+ kBackgroundBorderWidth,
+ kBackgroundBorderBottomWidth);
+ paint.setColor(SK_ColorWHITE);
+ canvas->DrawRoundRect(bounds, kBackgroundBorderCornerRadius, paint);
+ }
+
+ DISALLOW_COPY_AND_ASSIGN(SearchBoxBackground);
+};
+
} // namespace
SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate,
@@ -51,6 +87,8 @@ SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate,
search_box_(new views::Textfield),
contents_view_(NULL) {
AddChildView(icon_view_);
+ if (switches::IsExperimentalAppListEnabled())
+ set_background(new SearchBoxBackground());
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
@@ -111,7 +149,10 @@ void SearchBoxView::InvalidateMenu() {
}
gfx::Size SearchBoxView::GetPreferredSize() const {
- return gfx::Size(kPreferredWidth, kPreferredHeight);
+ return gfx::Size(kPreferredWidth,
+ switches::IsExperimentalAppListEnabled()
+ ? kExperimentalSearchBoxHeight
+ : kPreferredHeight);
}
void SearchBoxView::Layout() {
« no previous file with comments | « ui/app_list/views/app_list_main_view.cc ('k') | ui/app_list/views/start_page_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698