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

Unified Diff: ui/views/window/dialog_client_view.cc

Issue 2855623004: Don't allow Checkboxes to participate in equal-sized-buttons in Harmony dialogs. (Closed)
Patch Set: Just checkboxes Created 3 years, 8 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
Index: ui/views/window/dialog_client_view.cc
diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc
index 3cd043e2eb325ade6518cbbba973ce97210df3ad..3de458fe938de7cbc832056e3b47164cb69f44b9 100644
--- a/ui/views/window/dialog_client_view.cc
+++ b/ui/views/window/dialog_client_view.cc
@@ -12,6 +12,7 @@
#include "ui/views/background.h"
#include "ui/views/border.h"
#include "ui/views/controls/button/blue_button.h"
+#include "ui/views/controls/button/checkbox.h"
#include "ui/views/controls/button/custom_button.h"
#include "ui/views/controls/button/label_button.h"
#include "ui/views/controls/button/md_text_button.h"
@@ -392,8 +393,13 @@ void DialogClientView::SetupLayout() {
}
if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
- // Only link the extra view column if it is a button.
- if (views[0] && !CustomButton::AsCustomButton(views[0]))
+ // If |views[0]| is non-null, it is a visible |extra_view_| and its column
+ // will be in |link[0]|. Skip that if it is not a button, or if it is a
+ // Checkbox (which extends LabelButton). Otherwise, link everything.
+ bool skip_first_link =
+ views[0] && (!CustomButton::AsCustomButton(views[0]) ||
+ views[0]->GetClassName() == Checkbox::kViewClassName);
+ if (skip_first_link)
column_set->LinkColumnSizes(link[1], link[2], -1);
else
column_set->LinkColumnSizes(link[0], link[1], link[2], -1);
« no previous file with comments | « no previous file | ui/views/window/dialog_client_view_unittest.cc » ('j') | ui/views/window/dialog_client_view_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698