# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: flo@chilicode.com-20100307160123-dnbp5zi9es1je5kh
# target_branch: http://bazaar.launchpad.net/~docky-core/docky/trunk/
# testament_sha1: 1f1c73f5f8580ef3cf1c36cbde7f86e9ce049aff
# timestamp: 2010-03-07 17:05:52 +0100
# base_revision_id: ricotz@t-online.de-20100307142527-tohdhzvowdhezgr6
# 
# Begin patch
=== modified file 'Docky/Docky/Interface/AutohideManager.cs'
--- Docky/Docky/Interface/AutohideManager.cs	2010-01-23 20:12:40 +0000
+++ Docky/Docky/Interface/AutohideManager.cs	2010-03-07 16:01:23 +0000
@@ -102,7 +102,8 @@
 				return;
 			cursor_area = area;
 			DockHovered = cursor_area.Contains (tracker.Cursor) 
-				&& (screen.ActiveWindow == null || (screen.ActiveWindow != null && !screen.ActiveWindow.IsFullscreen));
+				&& (screen.ActiveWindow == null || (screen.ActiveWindow != null
+				&& !( screen.ActiveWindow.IsFullscreen && screen.ActiveWindow.EasyGeometry().IntersectsWith(intersect_area))));
 			SetHidden ();
 			
 		}
@@ -119,7 +120,8 @@
 		void HandleCursorPositionChanged (object sender, CursorPostionChangedArgs args)
 		{
 			DockHovered = cursor_area.Contains (tracker.Cursor)
-				&& (screen.ActiveWindow == null || (screen.ActiveWindow != null && !screen.ActiveWindow.IsFullscreen));
+				&& (screen.ActiveWindow == null || (screen.ActiveWindow != null
+				&& !( screen.ActiveWindow.IsFullscreen && screen.ActiveWindow.EasyGeometry().IntersectsWith(intersect_area))));
 			SetHidden ();
 		}
 

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWpFaB0AAZ7fgEAwcWP//3Oi
CIC//9/0UAPelztsu6UJlQJJI0JoTyNNT0T1E/QDJT09Ufqh6mnqehPUGUQaniNJmVPU9RsoMAAJ
kGCAkiNETCU9Twp5NTZRhGNEyGgwA5gAJgACYAAAAACShNT01PTU9JiMKnoyRoaeUD0QA0GBWMBO
DqUKejMZ9L/kYYwVjZIMxmLhzn3n7PqdIe48q++VmZR9DtDIxY3jPO+MesJiXt0zf72m9pPejmDn
Kk3jjLrNwXWZqtFn88E5kZRcAlOJSOiGRtNrBoXm/S0YH6E1XC3Z2MCe5YcUyEANCgwsS0TA+N9L
p7oSuH2ScRJb2EMLB5OgbQMYoOC2wmi1UPqDUGIsrKJZB6Oq7qiOua3mzKcjynRLKnSpCnIZvF82
Hq1oakojBRsseIBbRRTaCsKmKRsILdtbzXMYCwk8Hb1PY4HwbiRFy3oGLI1KoKZX5lfcZsfRYZKt
Ra5dA8k11CRxEjHOplpZXYGaITJ9AbnzlhiB87QVzsZPTEDWMD71WB8DMK/EwNazQQHm+YTy1eUj
nF14Li/UywQhcxalUbEyLQYxVGLp3UKksZc2GWHseCvzFpKZIhVxjO2bFq0cq6arImWBSKv9znqa
4+pbkzmfexIemHK9LuFYD8XgyY/boS7iciAKrGAVFo2jWg7m441Ghi8OXnx7S9hjXwh7pGzwC1bm
zO7Vj+PD5MaKyJWfS2PNq4QDepuIIc4tm1HmYtSrogb4lu5D4O8hBk8v6ldHA5krUp3BYkQLWdgG
COh98Hkk9ZNywW7CtVTCiVxVhFpSfivBcjqLpvigjZuXOjkkRBB5HhOYevcUhVtsqvtx3l7sX6An
yheVlKKVG03TZT4uwlSNOOZ7HVjImSIidMvknT6aDOyNcwvSqFlKDlMoIeEQ0sekefFu3AwG3v09
YiFm2XAUrqGg2OaoLVPifQoVEk5ZgkPOUWhT7knBd0VadJfIbknpNKqB/g6MCQU0yIMz3PxD4+kN
Zx2APs8BZrxQbwqTmBoF6gDnAzgI0Dsou0NsGhml62hLelBuVuq+BtDzmbKlJvDAMnU+MTwDMhTb
c4UJB7Dp2VQdY4JWmhLDWJ0rBqh9Lw1EYBFq73KcQkg4Lb1FS5jE4hG+p19wvYnBGZekMimq4sK7
YB1llfApkxhrVwUxavkQtuldwTCHRZIos7bAZJZVrUi9T7PIHXDuo9kXChQ2zI4W1aiQFqzUwkFB
6rcpawt583hyOJ22eVxFSArWwO5TBYXd71tRYd71iE7CCrEzmvMkf8XckU4UJBqRWgdA