mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1998-10-28 Federico Mena Quintero <federico@nuclecu.unam.mx> 

* desktop-icon.c (reshape): Position the icon text item correctly.
This commit is contained in:
Miguel de Icaza 1998-10-28 17:04:58 +00:00
parent 86300fb4a4
commit 4ce383d64b
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnome/ChangeLog
View File

@ -1,3 +1,7 @@
1998-10-28 Federico Mena Quintero <federico@nuclecu.unam.mx>
* desktop-icon.c (reshape): Position the icon text item correctly.
1998-10-27 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-10-27 Federico Mena Quintero <federico@nuclecu.unam.mx>
* desktop-icon.c (desktop_icon_new): Do now reshape more than * desktop-icon.c (desktop_icon_new): Do now reshape more than

18
gnome/gdesktop-icon.c
View File

@ -85,7 +85,7 @@ create_window_shape (DesktopIcon *dicon, int icon_width, int icon_height, int te
/* Paint the mask of the image */ /* Paint the mask of the image */
im = GNOME_CANVAS_IMAGE (dicon->icon)->im; im = GNOME_CANVAS_IMAGE (dicon->icon)->im;
gdk_imlib_render (im, im->rgb_width, im->rgb_height); gdk_imlib_render (im, icon_width, icon_height);
im_mask = gdk_imlib_move_mask (im); im_mask = gdk_imlib_move_mask (im);
if (im_mask) { if (im_mask) {
@ -142,7 +142,7 @@ reshape (DesktopIcon *dicon)
/* Calculate new size of widget */ /* Calculate new size of widget */
dicon->width = MAX (icon_width, text_width); dicon->width = MAX (icon_width, SNAP_X);
dicon->height = icon_height + SPACING + text_height; dicon->height = icon_height + SPACING + text_height;
/* Set new position of children */ /* Set new position of children */
@ -152,9 +152,7 @@ reshape (DesktopIcon *dicon)
"y", 0.0, "y", 0.0,
NULL); NULL);
gnome_icon_text_item_setxy (GNOME_ICON_TEXT_ITEM (dicon->text), gnome_icon_text_item_setxy (GNOME_ICON_TEXT_ITEM (dicon->text), 0, icon_height + SPACING);
(dicon->width - text_width) / 2,
icon_height + SPACING);
/* Create and set the window shape */ /* Create and set the window shape */
@ -272,18 +270,18 @@ static void
set_text (DesktopIcon *dicon, char *text) set_text (DesktopIcon *dicon, char *text)
{ {
GtkArg arg; GtkArg arg;
int icon_width; int icon_height;
arg.name = "width"; arg.name = "height";
gtk_object_getv (GTK_OBJECT (dicon->icon), 1, &arg); gtk_object_getv (GTK_OBJECT (dicon->icon), 1, &arg);
icon_width = GTK_VALUE_DOUBLE (arg); icon_height = GTK_VALUE_DOUBLE (arg);
gtk_signal_handler_block (GTK_OBJECT (dicon->text), dicon->w_changed_id); gtk_signal_handler_block (GTK_OBJECT (dicon->text), dicon->w_changed_id);
gtk_signal_handler_block (GTK_OBJECT (dicon->text), dicon->h_changed_id); gtk_signal_handler_block (GTK_OBJECT (dicon->text), dicon->h_changed_id);
gnome_icon_text_item_configure (GNOME_ICON_TEXT_ITEM (dicon->text), gnome_icon_text_item_configure (GNOME_ICON_TEXT_ITEM (dicon->text),
0, 0, 0, icon_height + SPACING,
MAX (SNAP_X, icon_width), SNAP_X,
DESKTOP_ICON_FONT, DESKTOP_ICON_FONT,
text, text,
TRUE); TRUE);