summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2010-04-06 20:20:18 +0000
committerAlbrecht Schlosser <albrechts.fltk@online.de>2010-04-06 20:20:18 +0000
commit7f37821bae91de481aa93c6b6ca86f57fe1bd90f (patch)
tree3423e8f9b5364bda135a2afd21dc2f4cfa017832
parent20b508a3b55cf6530afc4da865e2533177d2ab1d (diff)
Fixed indentation of previous commit and added CHANGES info (STR #2082).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7460 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--CHANGES2
-rw-r--r--src/Fl_x.cxx4
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index d7d39214e..6fd109eaa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
CHANGES IN FLTK 1.3.0
+ - Fixed menu and tooltip window animation bug under X11 (compiz)
+ by setting an appropriate window type (STR #2082)
- redesigned CMake files (STR #2317).
- Fixed max. fd calculation, if USE_POLL is enabled (STR #2324)
- Fixed clipping for offscreen rendering (OSX, STR #2330)
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index d47170670..1c81503f8 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -1587,10 +1587,10 @@ void Fl_X::make_xid(Fl_Window* win, XVisualInfo *visual, Colormap colormap)
XSetWMHints(fl_display, xp->xid, hints);
XFree(hints);
}
-
+
// set the window type for menu and tooltip windows to avoid animations (compiz)
if (win->menu_window() || win->tooltip_window()) {
- Atom net_wm_type = XInternAtom(fl_display, "_NET_WM_WINDOW_TYPE", False);
+ Atom net_wm_type = XInternAtom(fl_display, "_NET_WM_WINDOW_TYPE", False);
Atom net_wm_type_kind = XInternAtom(fl_display, "_NET_WM_WINDOW_TYPE_MENU", False);
int ret = XChangeProperty(fl_display, xp->xid, net_wm_type, XA_ATOM, 32, PropModeReplace, (unsigned char*)&net_wm_type_kind, 1);
}