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 "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h" | 5 #include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h" |
6 | 6 |
7 #include <X11/extensions/XInput2.h> | 7 #include <X11/extensions/XInput2.h> |
8 #include <X11/Xatom.h> | 8 #include <X11/Xatom.h> |
9 #include <X11/Xutil.h> | 9 #include <X11/Xutil.h> |
10 | 10 |
(...skipping 1178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1189 // Now that we have different window properties, we may need to | 1189 // Now that we have different window properties, we may need to |
1190 // relayout the window. (The windows code doesn't need this because | 1190 // relayout the window. (The windows code doesn't need this because |
1191 // their window change is synchronous.) | 1191 // their window change is synchronous.) |
1192 // | 1192 // |
1193 // TODO(erg): While this does work, there's a quick flash showing the | 1193 // TODO(erg): While this does work, there's a quick flash showing the |
1194 // tabstrip/toolbar/etc. when going into fullscreen mode before hiding | 1194 // tabstrip/toolbar/etc. when going into fullscreen mode before hiding |
1195 // those parts of the UI because we receive the sizing event from the | 1195 // those parts of the UI because we receive the sizing event from the |
1196 // window manager before we receive the event that changes the | 1196 // window manager before we receive the event that changes the |
1197 // fullscreen state. Unsure what to do about that. | 1197 // fullscreen state. Unsure what to do about that. |
1198 Widget* widget = native_widget_delegate_->AsWidget(); | 1198 Widget* widget = native_widget_delegate_->AsWidget(); |
1199 NonClientView* non_client_view = widget->non_client_view(); | 1199 // NonClientView* non_client_view = widget->non_client_view(); |
1200 // non_client_view may be NULL, especially during creation. | 1200 // non_client_view may be NULL, especially during creation. |
1201 if (non_client_view) { | 1201 // if (non_client_view) { |
1202 non_client_view->client_view()->InvalidateLayout(); | 1202 // non_client_view->client_view()->InvalidateLayout(); |
1203 non_client_view->InvalidateLayout(); | 1203 // non_client_view->InvalidateLayout(); |
1204 } | 1204 // } |
1205 widget->GetRootView()->Layout(); | 1205 widget->GetRootView()->Layout(); |
1206 } | 1206 } |
1207 break; | 1207 break; |
1208 } | 1208 } |
1209 case SelectionNotify: { | 1209 case SelectionNotify: { |
1210 if (drop_handler_) | 1210 if (drop_handler_) |
1211 drop_handler_->OnSelectionNotify(xev->xselection); | 1211 drop_handler_->OnSelectionNotify(xev->xselection); |
1212 break; | 1212 break; |
1213 } | 1213 } |
1214 } | 1214 } |
1215 return true; | 1215 return true; |
1216 } | 1216 } |
1217 | 1217 |
1218 //////////////////////////////////////////////////////////////////////////////// | 1218 //////////////////////////////////////////////////////////////////////////////// |
1219 // DesktopRootWindowHost, public: | 1219 // DesktopRootWindowHost, public: |
1220 | 1220 |
1221 // static | 1221 // static |
1222 DesktopRootWindowHost* DesktopRootWindowHost::Create( | 1222 DesktopRootWindowHost* DesktopRootWindowHost::Create( |
1223 internal::NativeWidgetDelegate* native_widget_delegate, | 1223 internal::NativeWidgetDelegate* native_widget_delegate, |
1224 DesktopNativeWidgetAura* desktop_native_widget_aura, | 1224 DesktopNativeWidgetAura* desktop_native_widget_aura, |
1225 const gfx::Rect& initial_bounds) { | 1225 const gfx::Rect& initial_bounds) { |
1226 return new DesktopRootWindowHostX11(native_widget_delegate, | 1226 return new DesktopRootWindowHostX11(native_widget_delegate, |
1227 desktop_native_widget_aura, | 1227 desktop_native_widget_aura, |
1228 initial_bounds); | 1228 initial_bounds); |
1229 } | 1229 } |
1230 | 1230 |
1231 } // namespace views | 1231 } // namespace views |
OLD | NEW |