diff options
author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 17:55:32 +0000 |
---|---|---|
committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 17:55:32 +0000 |
commit | 2406f82f9bcff9b022c774010f68496009b3c066 (patch) | |
tree | 7eb27aab36a5b17f0c5b1752a3120e981d9b3de1 /ui/views | |
parent | 85792f2dd8e933c34ce875792eb1241302c8609f (diff) | |
download | chromium_src-2406f82f9bcff9b022c774010f68496009b3c066.zip chromium_src-2406f82f9bcff9b022c774010f68496009b3c066.tar.gz chromium_src-2406f82f9bcff9b022c774010f68496009b3c066.tar.bz2 |
Revert "linux_aura: Implement SetOpacity()."
This reverts r201447. SetOpacity() was hooked up backwards; I got confused
while reading the GTK+ code. However, if the "255 -" is simply removed, menus
stop showing. It looks like the menu system is still calling SetOpacity(0).
BUG=none
TBR=sidharthms@google.com,sky@chromium.org
Review URL: https://codereview.chromium.org/16189008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202910 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views')
-rw-r--r-- | ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc index 1ad0e76..c86af2d 100644 --- a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc +++ b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc @@ -74,7 +74,6 @@ const char* kAtomsToCache[] = { "_NET_WM_STATE_HIDDEN", "_NET_WM_STATE_MAXIMIZED_HORZ", "_NET_WM_STATE_MAXIMIZED_VERT", - "_NET_WM_WINDOW_OPACITY", "XdndActionAsk", "XdndActionCopy" "XdndActionLink", @@ -638,20 +637,8 @@ bool DesktopRootWindowHostX11::IsFullscreen() const { } void DesktopRootWindowHostX11::SetOpacity(unsigned char opacity) { - // X server opacity is in terms of 32 bit unsigned int space, and counts from - // the opposite direction. - unsigned int cardinality = (255 - opacity) * 0x1010101; - - if (cardinality == 0xffffffff) { - XDeleteProperty(xdisplay_, xwindow_, - atom_cache_.GetAtom("_NET_WM_WINDOW_OPACITY")); - } else { - XChangeProperty(xdisplay_, xwindow_, - atom_cache_.GetAtom("_NET_WM_WINDOW_OPACITY"), - XA_CARDINAL, 32, - PropModeReplace, - reinterpret_cast<unsigned char*>(&cardinality), 1); - } + // TODO(erg): + NOTIMPLEMENTED(); } void DesktopRootWindowHostX11::SetWindowIcons( |