nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use dock_get_area instead of accessing dock struct directly

Browse source
This commit is contained in:
Mikael Magnusson 2007-07-13 16:14:02 +02:00
parent fc32204f3c
commit 355981bf14
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
openbox/client.c
View file

@ -64,8 +64,6 @@ typedef struct
GList *client_list = NULL; GList *client_list = NULL;
extern ObDock *dock;
static GSList *client_destroy_notifies = NULL; static GSList *client_destroy_notifies = NULL;
static void client_get_all(ObClient *self, gboolean real); static void client_get_all(ObClient *self, gboolean real);
@ -3948,6 +3946,7 @@ void client_find_edge_directional(ObClient *self, ObDirection dir,
{ {
GList *it; GList *it;
Rect *a, *mon; Rect *a, *mon;
Rect dock_area;
gint edge; gint edge;
a = screen_area(self->desktop, SCREEN_AREA_ALL_MONITORS, a = screen_area(self->desktop, SCREEN_AREA_ALL_MONITORS,
@ -4004,7 +4003,8 @@ void client_find_edge_directional(ObClient *self, ObDirection dir,
detect_edge(cur->frame->area, dir, my_head, my_size, my_edge_start, detect_edge(cur->frame->area, dir, my_head, my_size, my_edge_start,
my_edge_size, dest, near_edge); my_edge_size, dest, near_edge);
} }
detect_edge(dock->area, dir, my_head, my_size, my_edge_start, dock_get_area(&dock_area);
detect_edge(dock_area, dir, my_head, my_size, my_edge_start,
my_edge_size, dest, near_edge); my_edge_size, dest, near_edge);
} }

2
openbox/dock.c
View file

@ -31,7 +31,7 @@
EnterWindowMask | LeaveWindowMask) EnterWindowMask | LeaveWindowMask)
#define DOCKAPP_EVENT_MASK (StructureNotifyMask) #define DOCKAPP_EVENT_MASK (StructureNotifyMask)
ObDock *dock; static ObDock *dock;
StrutPartial dock_strut; StrutPartial dock_strut;