OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/gtk/find_bar_gtk.h" | 5 #include "chrome/browser/gtk/find_bar_gtk.h" |
6 | 6 |
7 #include <gdk/gdkkeysyms.h> | 7 #include <gdk/gdkkeysyms.h> |
8 | 8 |
9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
10 #include "base/gfx/gtk_util.h" | 10 #include "base/gfx/gtk_util.h" |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 GtkWidget* border_bin = gtk_util::CreateGtkBorderBin(content_hbox, | 178 GtkWidget* border_bin = gtk_util::CreateGtkBorderBin(content_hbox, |
179 &kTextBorderColor, | 179 &kTextBorderColor, |
180 1, 1, 1, 0); | 180 1, 1, 1, 0); |
181 GtkWidget* border_bin_aa = gtk_util::CreateGtkBorderBin(border_bin, | 181 GtkWidget* border_bin_aa = gtk_util::CreateGtkBorderBin(border_bin, |
182 &kTextBorderColorAA, | 182 &kTextBorderColorAA, |
183 1, 1, 1, 0); | 183 1, 1, 1, 0); |
184 GtkWidget* centering_vbox = gtk_vbox_new(FALSE, 0); | 184 GtkWidget* centering_vbox = gtk_vbox_new(FALSE, 0); |
185 gtk_box_pack_start(GTK_BOX(centering_vbox), border_bin_aa, TRUE, FALSE, 0); | 185 gtk_box_pack_start(GTK_BOX(centering_vbox), border_bin_aa, TRUE, FALSE, 0); |
186 gtk_box_pack_end(GTK_BOX(hbox), centering_vbox, FALSE, FALSE, 0); | 186 gtk_box_pack_end(GTK_BOX(hbox), centering_vbox, FALSE, FALSE, 0); |
187 | 187 |
188 // We show just the GtkFixed and |border_| (but not the dialog). | 188 // We take care to avoid showing the slide animator widget. |
| 189 gtk_widget_show_all(container_); |
189 gtk_widget_show(widget()); | 190 gtk_widget_show(widget()); |
190 gtk_widget_show(border_); | 191 gtk_widget_show(border_); |
191 gtk_widget_show(match_count_label_); | |
192 } | 192 } |
193 | 193 |
194 GtkWidget* FindBarGtk::slide_widget() { | 194 GtkWidget* FindBarGtk::slide_widget() { |
195 return slide_widget_->widget(); | 195 return slide_widget_->widget(); |
196 } | 196 } |
197 | 197 |
198 void FindBarGtk::Show() { | 198 void FindBarGtk::Show() { |
199 slide_widget_->Open(); | 199 slide_widget_->Open(); |
200 if (container_->window) | 200 if (container_->window) |
201 gdk_window_raise(container_->window); | 201 gdk_window_raise(container_->window); |
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
416 } | 416 } |
417 | 417 |
418 // static | 418 // static |
419 gboolean FindBarGtk::OnButtonPress(GtkWidget* text_entry, GdkEventButton* e, | 419 gboolean FindBarGtk::OnButtonPress(GtkWidget* text_entry, GdkEventButton* e, |
420 FindBarGtk* find_bar) { | 420 FindBarGtk* find_bar) { |
421 find_bar->StoreOutsideFocus(); | 421 find_bar->StoreOutsideFocus(); |
422 | 422 |
423 // Continue propagating the event. | 423 // Continue propagating the event. |
424 return FALSE; | 424 return FALSE; |
425 } | 425 } |
OLD | NEW |