1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
|
diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-profile.c
--- gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding 2009-09-21 12:29:33.000000000 -0400
+++ gnome-panel-2.28.0/gnome-panel/panel-profile.c 2009-10-29 09:57:25.285484907 -0400
@@ -638,6 +638,7 @@ TOPLEVEL_IS_WRITABLE_FUNC ("orientation"
TOPLEVEL_GET_SET_FUNCS ("size", toplevel, int, size, int)
TOPLEVEL_GET_SET_FUNCS ("expand", toplevel, bool, expand, gboolean)
+TOPLEVEL_GET_SET_FUNCS ("padding", toplevel, int, padding, int)
TOPLEVEL_GET_SET_FUNCS ("auto_hide", toplevel, bool, auto_hide, gboolean)
TOPLEVEL_GET_SET_FUNCS ("enable_buttons", toplevel, bool, enable_buttons, gboolean)
TOPLEVEL_GET_SET_FUNCS ("enable_arrows", toplevel, bool, enable_arrows, gboolean)
@@ -1185,6 +1186,7 @@ panel_profile_toplevel_change_notify (GC
else UPDATE_INT ("monitor", monitor)
else UPDATE_STRING ("name", name)
else UPDATE_BOOL ("expand", expand)
+ else UPDATE_INT ("padding", padding)
else UPDATE_STRING ("orientation", orientation)
else UPDATE_INT ("size", size)
else UPDATE_POS ("x", x, x_right)
@@ -1706,6 +1708,7 @@ panel_profile_load_toplevel (GConfClient
GET_STRING ("name", name);
GET_INT ("monitor", monitor);
GET_BOOL ("expand", expand);
+ GET_INT ("padding", padding);
GET_STRING ("orientation", orientation);
GET_INT ("size", size);
GET_BOOL ("auto_hide", auto_hide);
diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding gnome-panel-2.28.0/gnome-panel/panel-profile.h
--- gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding 2009-04-19 13:45:09.000000000 -0400
+++ gnome-panel-2.28.0/gnome-panel/panel-profile.h 2009-10-29 09:57:25.285484907 -0400
@@ -92,7 +92,10 @@ void panel_profile_set_toplevel_e
gboolean expand);
gboolean panel_profile_get_toplevel_expand (PanelToplevel *toplevel);
gboolean panel_profile_is_writable_toplevel_expand (PanelToplevel *toplevel);
-
+void panel_profile_set_toplevel_padding (PanelToplevel *toplevel,
+ int padding);
+int panel_profile_get_toplevel_padding (PanelToplevel *padding);
+gboolean panel_profile_is_writable_toplevel_padding (PanelToplevel *toplevel);
void panel_profile_set_toplevel_auto_hide (PanelToplevel *toplevel,
gboolean auto_hide);
gboolean panel_profile_get_toplevel_auto_hide (PanelToplevel *toplevel);
diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.c
--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding 2009-08-21 06:31:49.000000000 -0400
+++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.c 2009-10-29 09:57:25.287500667 -0400
@@ -79,6 +79,7 @@ struct _PanelToplevelPrivate {
gboolean expand;
PanelOrientation orientation;
int size;
+ int padding;
/* relative to the monitor origin */
int x;
@@ -213,6 +214,7 @@ enum {
PROP_0,
PROP_NAME,
PROP_EXPAND,
+ PROP_PADDING,
PROP_ORIENTATION,
PROP_SIZE,
PROP_X,
@@ -3862,6 +3864,9 @@ panel_toplevel_set_property (GObject
case PROP_EXPAND:
panel_toplevel_set_expand (toplevel, g_value_get_boolean (value));
break;
+ case PROP_PADDING:
+ panel_toplevel_set_padding (toplevel, g_value_get_int (value));
+ break;
case PROP_ORIENTATION:
panel_toplevel_set_orientation (toplevel, g_value_get_enum (value));
break;
@@ -3956,6 +3961,9 @@ panel_toplevel_get_property (GObject
case PROP_EXPAND:
g_value_set_boolean (value, toplevel->priv->expand);
break;
+ case PROP_PADDING:
+ g_value_set_int (value, toplevel->priv->padding);
+ break;
case PROP_ORIENTATION:
g_value_set_enum (value, toplevel->priv->orientation);
break;
@@ -4118,6 +4126,18 @@ panel_toplevel_class_init (PanelToplevel
g_object_class_install_property (
gobject_class,
+ PROP_PADDING,
+ g_param_spec_int (
+ "padding",
+ "Padding",
+ "Padding that is inserted between objects",
+ 0,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+
+ g_object_class_install_property (
+ gobject_class,
PROP_ORIENTATION,
g_param_spec_enum (
"orientation",
@@ -4698,6 +4718,30 @@ panel_toplevel_get_expand (PanelToplevel
return toplevel->priv->expand;
}
+void
+panel_toplevel_set_padding (PanelToplevel *toplevel,
+ int padding)
+{
+ g_return_if_fail (PANEL_IS_TOPLEVEL (toplevel));
+
+ if (toplevel->priv->padding == padding)
+ return;
+
+ toplevel->priv->padding = padding;
+
+ gtk_widget_queue_resize (GTK_WIDGET (toplevel));
+
+ g_object_notify (G_OBJECT (toplevel), "padding");
+}
+
+int
+panel_toplevel_get_padding (PanelToplevel *toplevel)
+{
+ g_return_val_if_fail (PANEL_IS_TOPLEVEL (toplevel), 0);
+
+ return toplevel->priv->padding;
+}
+
gboolean
panel_toplevel_get_is_floating (PanelToplevel *toplevel)
{
diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.h
--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding 2009-08-19 11:28:09.000000000 -0400
+++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.h 2009-10-29 09:57:25.288484940 -0400
@@ -83,6 +83,9 @@ G_CONST_RETURN char *panel_toplevel_get_
void panel_toplevel_set_expand (PanelToplevel *toplevel,
gboolean expand);
gboolean panel_toplevel_get_expand (PanelToplevel *toplevel);
+void panel_toplevel_set_padding (PanelToplevel *toplevel,
+ int padding);
+int panel_toplevel_get_padding (PanelToplevel *toplevel);
void panel_toplevel_set_orientation (PanelToplevel *toplevel,
PanelOrientation orientation);
PanelOrientation panel_toplevel_get_orientation (PanelToplevel *toplevel);
diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in
--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding 2009-07-01 09:06:23.000000000 -0400
+++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in 2009-10-29 09:57:25.288484940 -0400
@@ -103,6 +103,19 @@
</schema>
<schema>
+ <key>/schemas/apps/panel/toplevels/padding</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>0</default>
+ <locale name="C">
+ <short>Padding</short>
+ <long>
+ Padding that will be inserted between objects on this panel.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
<key>/schemas/apps/panel/toplevels/x</key>
<owner>panel</owner>
<type>int</type>
diff -up gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-widget.c
--- gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding 2009-08-11 07:32:38.000000000 -0400
+++ gnome-panel-2.28.0/gnome-panel/panel-widget.c 2009-10-29 10:10:43.531226534 -0400
@@ -710,9 +710,12 @@ panel_widget_switch_applet_right (PanelW
{
AppletData *ad;
AppletData *nad = NULL;
-
+ gint padding;
+
g_assert (list != NULL);
+ padding = panel_toplevel_get_padding (panel->toplevel);
+
ad = list->data;
if (ad->constrained + ad->min_cells >= panel->size)
return;
@@ -720,8 +723,8 @@ panel_widget_switch_applet_right (PanelW
if (list->next)
nad = list->next->data;
- if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT) {
- ad->pos = ad->constrained += MOVE_INCREMENT;
+ if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT + padding) {
+ ad->pos = ad->constrained += MOVE_INCREMENT + padding;
gtk_widget_queue_resize (GTK_WIDGET (panel));
emit_applet_moved (panel, ad);
return;
@@ -786,6 +789,9 @@ panel_widget_switch_applet_left (PanelWi
{
AppletData *ad;
AppletData *pad = NULL;
+ gint padding;
+
+ padding = panel_toplevel_get_padding (panel->toplevel);
ad = list->data;
if (ad->constrained <= 0)
@@ -794,8 +800,8 @@ panel_widget_switch_applet_left (PanelWi
if (list->prev)
pad = list->prev->data;
- if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT) {
- ad->pos = ad->constrained -= MOVE_INCREMENT;
+ if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT - padding) {
+ ad->pos = ad->constrained -= MOVE_INCREMENT + padding;
gtk_widget_queue_resize (GTK_WIDGET (panel));
emit_applet_moved (panel, ad);
return;
@@ -874,15 +880,18 @@ panel_widget_get_right_switch_pos (Panel
{
AppletData *ad;
AppletData *nad = NULL;
+ gint padding;
g_assert (list != NULL);
+ padding = panel_toplevel_get_padding (panel->toplevel);
+
ad = list->data;
if (list->next)
nad = list->next->data;
- if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT)
- return ad->constrained + MOVE_INCREMENT;
+ if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT + padding)
+ return ad->constrained + MOVE_INCREMENT + padding;
if (nad->locked)
return panel_widget_get_right_jump_pos (panel,
@@ -948,15 +957,18 @@ panel_widget_get_left_switch_pos (PanelW
{
AppletData *ad;
AppletData *pad = NULL;
+ gint padding;
g_assert (list != NULL);
+ padding = panel_toplevel_get_padding (panel->toplevel);
+
ad = list->data;
if (list->prev)
pad = list->prev->data;
- if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT)
- return ad->constrained - MOVE_INCREMENT;
+ if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT - padding)
+ return ad->constrained - MOVE_INCREMENT - padding;
if (pad->locked)
return panel_widget_get_left_jump_pos (panel,
@@ -1195,12 +1207,15 @@ panel_widget_size_request(GtkWidget *wid
GList *list;
GList *ad_with_hints;
gboolean dont_fill;
+ gint padding;
g_return_if_fail(PANEL_IS_WIDGET(widget));
g_return_if_fail(requisition!=NULL);
panel = PANEL_WIDGET(widget);
+ padding = panel_toplevel_get_padding (panel->toplevel);
+
if(panel->orient == GTK_ORIENTATION_HORIZONTAL) {
requisition->width = 0;
requisition->height = panel->sz;
@@ -1224,8 +1239,11 @@ panel_widget_size_request(GtkWidget *wid
ad_with_hints = g_list_prepend (ad_with_hints,
ad);
- else if (panel->packed)
+ else if (panel->packed) {
+ if (list != panel->applet_list)
+ requisition->width += padding;
requisition->width += chreq.width;
+ }
} else {
if (requisition->width < chreq.width && !ad->size_constrained)
requisition->width = chreq.width;
@@ -1234,8 +1252,11 @@ panel_widget_size_request(GtkWidget *wid
ad_with_hints = g_list_prepend (ad_with_hints,
ad);
- else if (panel->packed)
+ else if (panel->packed) {
+ if (list != panel->applet_list)
+ requisition->height += padding;
requisition->height += chreq.height;
+ }
}
}
@@ -1333,12 +1354,15 @@ panel_widget_size_allocate(GtkWidget *wi
int i;
int old_size;
gboolean ltr;
+ gint padding;
g_return_if_fail(PANEL_IS_WIDGET(widget));
g_return_if_fail(allocation!=NULL);
panel = PANEL_WIDGET(widget);
+ padding = panel_toplevel_get_padding (panel->toplevel);
+
old_size = panel->size;
ltr = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR;
@@ -1404,7 +1428,7 @@ panel_widget_size_allocate(GtkWidget *wi
}
ad->min_cells = ad->cells;
gtk_widget_size_allocate(ad->applet,&challoc);
- i += ad->cells;
+ i += ad->cells + padding;
}
/* EEEEK, there might be not enough room and we don't handle
@@ -1439,7 +1463,7 @@ panel_widget_size_allocate(GtkWidget *wi
if (ad->constrained < i)
ad->constrained = i;
- i = ad->constrained + ad->cells;
+ i = ad->constrained + ad->cells + padding;
}
/* Now expand from the right */
@@ -1464,7 +1488,7 @@ panel_widget_size_allocate(GtkWidget *wi
ad->cells = cells;
}
- i = ad->constrained;
+ i = ad->constrained - padding;
}
/* EEEEK, there's not enough room, so shift applets even
|
