OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/gtk/panels/panel_titlebar_gtk.h" | 5 #include "chrome/browser/ui/gtk/panels/panel_titlebar_gtk.h" |
6 | 6 |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "chrome/browser/ui/gtk/custom_button.h" | 8 #include "chrome/browser/ui/gtk/custom_button.h" |
9 #include "chrome/browser/ui/gtk/gtk_theme_service.h" | 9 #include "chrome/browser/ui/gtk/gtk_theme_service.h" |
10 #include "chrome/browser/ui/gtk/gtk_util.h" | 10 #include "chrome/browser/ui/gtk/gtk_util.h" |
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
259 DCHECK(event && event->type == GDK_BUTTON_RELEASE); | 259 DCHECK(event && event->type == GDK_BUTTON_RELEASE); |
260 | 260 |
261 if (minimize_button_->widget() == button) { | 261 if (minimize_button_->widget() == button) { |
262 panel->OnMinimizeButtonClicked( | 262 panel->OnMinimizeButtonClicked( |
263 (event->button.state & GDK_CONTROL_MASK) ? | 263 (event->button.state & GDK_CONTROL_MASK) ? |
264 panel::APPLY_TO_ALL : panel::NO_MODIFIER); | 264 panel::APPLY_TO_ALL : panel::NO_MODIFIER); |
265 } else if (restore_button_->widget() == button) { | 265 } else if (restore_button_->widget() == button) { |
266 panel->OnRestoreButtonClicked( | 266 panel->OnRestoreButtonClicked( |
267 (event->button.state & GDK_CONTROL_MASK) ? | 267 (event->button.state & GDK_CONTROL_MASK) ? |
268 panel::APPLY_TO_ALL : panel::NO_MODIFIER); | 268 panel::APPLY_TO_ALL : panel::NO_MODIFIER); |
| 269 panel->Activate(); |
269 } | 270 } |
270 | 271 |
271 gdk_event_free(event); | 272 gdk_event_free(event); |
272 } | 273 } |
273 | 274 |
274 void PanelTitlebarGtk::SendEnterNotifyToCloseButtonIfUnderMouse() { | 275 void PanelTitlebarGtk::SendEnterNotifyToCloseButtonIfUnderMouse() { |
275 if (!close_button()) | 276 if (!close_button()) |
276 return; | 277 return; |
277 | 278 |
278 gint x; | 279 gint x; |
(...skipping 29 matching lines...) Expand all Loading... |
308 event->crossing.state = 0; | 309 event->crossing.state = 0; |
309 | 310 |
310 g_signal_emit_by_name(GTK_OBJECT(close_button()->widget()), | 311 g_signal_emit_by_name(GTK_OBJECT(close_button()->widget()), |
311 "enter-notify-event", event, | 312 "enter-notify-event", event, |
312 &return_value); | 313 &return_value); |
313 } | 314 } |
314 | 315 |
315 GtkWidget* PanelTitlebarGtk::widget() const { | 316 GtkWidget* PanelTitlebarGtk::widget() const { |
316 return container_; | 317 return container_; |
317 } | 318 } |
OLD | NEW |