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_window_tree_host_x11.h" | 5 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" |
6 | 6 |
7 #include <X11/extensions/shape.h> | 7 #include <X11/extensions/shape.h> |
8 #include <X11/extensions/XInput2.h> | 8 #include <X11/extensions/XInput2.h> |
9 #include <X11/Xatom.h> | 9 #include <X11/Xatom.h> |
10 #include <X11/Xregion.h> | 10 #include <X11/Xregion.h> |
(...skipping 1129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1140 } | 1140 } |
1141 // An in-activatable window should not interact with the system wm. | 1141 // An in-activatable window should not interact with the system wm. |
1142 if (!activatable_) | 1142 if (!activatable_) |
1143 swa.override_redirect = True; | 1143 swa.override_redirect = True; |
1144 | 1144 |
1145 if (swa.override_redirect) | 1145 if (swa.override_redirect) |
1146 attribute_mask |= CWOverrideRedirect; | 1146 attribute_mask |= CWOverrideRedirect; |
1147 | 1147 |
1148 Visual* visual; | 1148 Visual* visual; |
1149 int depth; | 1149 int depth; |
1150 ui::ChooseVisualForWindow(&visual, &depth); | 1150 ui::ChooseVisualForWindow(true, &visual, &depth); |
sadrul
2016/07/15 15:12:13
true /* enable_transparent_visuals */
In old code
| |
1151 if (depth == 32) { | 1151 if (depth == 32) { |
1152 attribute_mask |= CWColormap; | 1152 attribute_mask |= CWColormap; |
1153 swa.colormap = | 1153 swa.colormap = |
1154 XCreateColormap(xdisplay_, x_root_window_, visual, AllocNone); | 1154 XCreateColormap(xdisplay_, x_root_window_, visual, AllocNone); |
1155 | 1155 |
1156 // x.org will BadMatch if we don't set a border when the depth isn't the | 1156 // x.org will BadMatch if we don't set a border when the depth isn't the |
1157 // same as the parent depth. | 1157 // same as the parent depth. |
1158 attribute_mask |= CWBorderPixel; | 1158 attribute_mask |= CWBorderPixel; |
1159 swa.border_pixel = 0; | 1159 swa.border_pixel = 0; |
1160 | 1160 |
(...skipping 922 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2083 if (linux_ui) { | 2083 if (linux_ui) { |
2084 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); | 2084 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); |
2085 if (native_theme) | 2085 if (native_theme) |
2086 return native_theme; | 2086 return native_theme; |
2087 } | 2087 } |
2088 | 2088 |
2089 return ui::NativeThemeAura::instance(); | 2089 return ui::NativeThemeAura::instance(); |
2090 } | 2090 } |
2091 | 2091 |
2092 } // namespace views | 2092 } // namespace views |
OLD | NEW |