applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

skip lines that are finished, but keep processing up coming lines. This

Browse source 
2005-01-26  Jody Goldberg <jody@gnome.org>

	* control-center.c (relayout_canvas) : skip lines that are finished,
	  but keep processing up coming lines.  This should make alignment
	  work again.  While we're here add a bit more padding at the bottom.
This commit is contained in:
Jody Goldberg 2005-01-26 19:49:17 +00:00 • committed by Jody Goldberg
parent 749c2a373e
commit 7d324e378a
3 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
control-center/ChangeLog
View file

@ -1,3 +1,9 @@
2005-01-26 Jody Goldberg <jody@gnome.org>
* control-center.c (relayout_canvas) : skip lines that are finished,
but keep processing up coming lines. This should make alignment
work again. While we're here add a bit more padding at the bottom.
2004-11-10 Mark McLoughlin <mark@skynet.ie>
* control-center-categories.[ch]: re-write to use libgnome-menu

31
control-center/control-center.c
View file

@ -68,6 +68,8 @@ typedef struct {
#define PAD 5 /*when scrolling keep a few pixels above or below if possible */
#define d(stuff)
static gboolean
single_click_activates (void)
{
@ -181,7 +183,7 @@ gnome_canvas_item_move_absolute (GnomeCanvasItem *item, double dx, double dy)
static void
relayout_canvas (ControlCenter *cc)
{
int count, i, j, line, line_i;
int count, i, j, line, line_col, col;
int vert_pos, category_vert_pos, category_horiz_pos;
gboolean keep_going;
double max_width, height, max_text_height, max_icon_height;
@ -195,27 +197,29 @@ relayout_canvas (ControlCenter *cc)
/* Do this in several iterations to keep things straight
* 0) walk down each column to decide when to wrap */
start_again :
d (fprintf (stderr, "START------------->\n"));
count = cc->info->n_categories;
cc->line_count = 0;
keep_going = TRUE;
for (i = 0 ; keep_going; i++) {
for (col = 0 ; keep_going; col++) {
d (fprintf (stderr, "\tcol[%d]\n", col));
keep_going = FALSE;
max_width = 0.;
/* 0.1) Find the maximum width for this column */
for (line = 0 ; line < breaks->len ; ) {
line_i = i + g_array_index (breaks, int, line);
line_col = col + g_array_index (breaks, int, line);
line++;
if (line < breaks->len && line_i >= g_array_index (breaks, int, line))
break;
if (line < breaks->len && line_col >= g_array_index (breaks, int, line))
continue;
/* 0.2) check the nth row within a category */
for (j = 0; j < count; j++) {
ControlCenterCategory *cat = cc->info->categories[j];
PangoLayout *layout;
if (line_i >= cat->n_entries)
if (line_col >= cat->n_entries)
continue;
ei = cat->entries[line_i]->user_data;
ei = cat->entries[line_col]->user_data;
if (ei == NULL)
continue;
keep_going = TRUE;
@ -244,16 +248,17 @@ start_again :
/* 0.3) Now go back and assign the max width */
for (line = 0 ; line < breaks->len ; ) {
line_i = i + g_array_index (breaks, int, line);
line_col = col + g_array_index (breaks, int, line);
d (fprintf (stderr, "col[%d] line[%d] == %g\n", col, line, max_width));
line++;
if (line < breaks->len && line_i >= g_array_index (breaks, int, line))
break;
if (line < breaks->len && line_col >= g_array_index (breaks, int, line))
continue;
for (j = 0; j < count; j++) {
ControlCenterCategory *cat = cc->info->categories[j];
if (line_i >= cat->n_entries)
if (line_col >= cat->n_entries)
continue;
ei = cat->entries[line_i]->user_data;
ei = cat->entries[line_col]->user_data;
if (ei != NULL) {
ei->width = max_width;
pango_layout_set_width (GNOME_CANVAS_TEXT (ei->text)->layout,
@ -350,7 +355,7 @@ start_again :
ei->height = height;
gnome_canvas_item_set (ei->selection,
"x2", (double) ei->width + 2 * PAD,
"y2", (double) ei->text_height,
"y2", (double) ei->text_height + 1, /* expand it down slightly */
NULL);
gnome_canvas_item_set (ei->cover,
"x2", (double) ei->width,

4
control-center/gnomecc.desktop.in.in
View file

@ -1,13 +1,15 @@
[Desktop Entry]
X-SuSE-translate=true
Encoding=UTF-8
_Name=GNOME Control Center
_Comment=The GNOME configuration tool
_GenericName=The GNOME configuration tool
Icon=gnome-control-center
Exec=gnome-control-center
Terminal=false
Type=Application
StartupNotify=true
Categories=GNOME;Application;Settings;
OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=control-center
X-GNOME-Bugzilla-Component=shell