Commit c9c47555 authored by Andy Hertzfeld's avatar Andy Hertzfeld

made it position things better when zoomed by multiplying by


       made it position things better when zoomed by multiplying by
       pixels_per_unit when appropriate
parent 10e2b000
2000-01-27 Andy Hertzfeld <andy@eazel.com>
*libnautilus/nautilus-icons-view-icon-item.c:
some fixes to improve positioning when zoomed by multiplying by pixel_per_unit
when appropriate
2000-01-27 John Sullivan <sullivan@eazel.com>
Finished this round of sorting architecture improvements.
......@@ -29,9 +35,6 @@
now uses GtkCList-style sorting instead of asking FMDirectoryView to sort.
(install_icon): Added a couple more g_return_if_fails.
2000-01-27 Darin Adler <darin@eazel.com>
......@@ -59,29 +62,29 @@
2000-01-27 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus-icons-view-icon-item.c:
made the canvas item respect the scale factor by removing code in
compute_viewport_affine that was defeating it. There's still a
bunch more to do to make it right for non-unity scale factors, but
at least we can start that now.
* libnautilus/nautilus-icons-view-icon-item.c:
made the canvas item respect the scale factor by removing code in
compute_viewport_affine that was defeating it. There's still a
bunch more to do to make it right for non-unity scale factors, but
at least we can start that now.
2000-01-27 Andy Hertzfeld <andy@eazel.com>
hooked zooming up to the background context menu; right now the canvas item
doesn't work at different zoom levels properly, which we'll fix soon.
hooked zooming up to the background context menu; right now the canvas item
doesn't work at different zoom levels properly, which we'll fix soon.
* libnautilus/fm-directory-view.c,h:
enable zoom in and zoom out items and hooked them up to callback
added a bump_zoom_level slot, to be overriden by subclasses, which the zoom callback use
* libnautilus/fm-directory-view.c,h:
enable zoom in and zoom out items and hooked them up to callback
added a bump_zoom_level slot, to be overriden by subclasses, which the zoom callback use
* libnautilus/fm-directory-view-icons.c:
added method for bump_zoom_index that calls the icon container to do the work
* libnautilus/fm-directory-view-icons.c:
added method for bump_zoom_index that calls the icon container to do the work
* libnautilus/gnome-icon-container-private.h:
added a private instance variable for zoom level
* libnautilus/gnome-icon-container-private.h:
added a private instance variable for zoom level
* libnautilus/gnome-icon-container.c,.h:
added methods for get_zoom_level and set_zoom_level
* libnautilus/gnome-icon-container.c,.h:
added methods for get_zoom_level and set_zoom_level
2000-01-27 Darin Adler <darin@eazel.com>
......@@ -206,10 +209,10 @@
2000-01-26 Andy Hertzfeld <andy@eazel.com>
* libnautilus/gnome-icon-container-dnd.c:
made the drag shadow have the same dimensions as the icon being dragged;
fixed bug where it was confusing the width and height order in the
custom uri it built for dragging within Nautilus
* libnautilus/gnome-icon-container-dnd.c:
made the drag shadow have the same dimensions as the icon being dragged;
fixed bug where it was confusing the width and height order in the
custom uri it built for dragging within Nautilus
2000-01-26 Darin Adler <darin@eazel.com>
......@@ -243,8 +246,8 @@
* src/file-manager/fm-icon-cache.c:
first cut at making images with small file sizes display as themselves
* libnautilus/nautilus-icons-view-icon-item.c:
clean-ups, plus added alternate selection boolean for keyboard selection
* libnautilus/nautilus-icons-view-icon-item.c:
clean-ups, plus added alternate selection boolean for keyboard selection
2000-01-25 John Sullivan <sullivan@eazel.com>
......@@ -254,8 +257,8 @@
2000-01-25 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus-icons-view-icon-item.c
disabled icon centering code that was causing glitchey updates
* libnautilus/nautilus-icons-view-icon-item.c
disabled icon centering code that was causing glitchey updates
2000-01-25 Darin Adler <darin@eazel.com>
......@@ -346,25 +349,25 @@
2000-01-25 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus-icons-view-icon-item.c,h:
new canvas item class for icon items. Now we use a single
canvas item to draw the icons instead of a group with two subitems.
This will pay-off when we implement the emblems, zooming and
special icons for text, etc. This is the first cut, I'm pretty
sure it doesn't work when pixels_per_item isn't 1.0 and there
are other small problems.
* libnautilus/nautilus-icons-view-icon-item.c,h:
new canvas item class for icon items. Now we use a single
canvas item to draw the icons instead of a group with two subitems.
This will pay-off when we implement the emblems, zooming and
special icons for text, etc. This is the first cut, I'm pretty
sure it doesn't work when pixels_per_item isn't 1.0 and there
are other small problems.
* libnautilus/gnome-icon-container-private.h:
removed old fields for sub-items
* libnautilus/gnome-icon-container-private.h:
removed old fields for sub-items
* libnautilus/Makefile.am:
added new item class to makefile
* libnautilus/Makefile.am:
added new item class to makefile
* libnautilus/gnome-icon-container-dnd.c:
drag asks main item for pixbuf instead of image item
* libnautilus/gnome-icon-container-dnd.c:
drag asks main item for pixbuf instead of image item
* libnautilus/gnome-icon-container.c:
use new icon item instead of making group with two sub-items
* libnautilus/gnome-icon-container.c:
use new icon item instead of making group with two sub-items
2000-01-24 Maciej Stachowiak <mjs@eazel.com>
......
......@@ -665,8 +665,8 @@ nautilus_icons_view_draw_text_box (GnomeCanvasItem* item, GdkDrawable *drawable,
gdk_gc_unref(temp_gc);
priv->text_width = (double) line_width;
priv->text_height = (double) line_height;
priv->text_width = item->canvas->pixels_per_unit * line_width;
priv->text_height = item->canvas->pixels_per_unit * (double) line_height;
}
/* draw the icon item */
......@@ -744,7 +744,7 @@ nautilus_icons_view_icon_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable
}
/* now compute the position of the label and draw it */
icon_height = priv->pixbuf->art_pixbuf->height;
icon_height = priv->pixbuf->art_pixbuf->height * item->canvas->pixels_per_unit;
nautilus_icons_view_draw_text_box(item, drawable, title_font, priv->label, item->x1 - x,
item->y1 - y + icon_height, priv->is_selected, TRUE);
}
......
......@@ -665,8 +665,8 @@ nautilus_icons_view_draw_text_box (GnomeCanvasItem* item, GdkDrawable *drawable,
gdk_gc_unref(temp_gc);
priv->text_width = (double) line_width;
priv->text_height = (double) line_height;
priv->text_width = item->canvas->pixels_per_unit * line_width;
priv->text_height = item->canvas->pixels_per_unit * (double) line_height;
}
/* draw the icon item */
......@@ -744,7 +744,7 @@ nautilus_icons_view_icon_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable
}
/* now compute the position of the label and draw it */
icon_height = priv->pixbuf->art_pixbuf->height;
icon_height = priv->pixbuf->art_pixbuf->height * item->canvas->pixels_per_unit;
nautilus_icons_view_draw_text_box(item, drawable, title_font, priv->label, item->x1 - x,
item->y1 - y + icon_height, priv->is_selected, TRUE);
}
......
......@@ -665,8 +665,8 @@ nautilus_icons_view_draw_text_box (GnomeCanvasItem* item, GdkDrawable *drawable,
gdk_gc_unref(temp_gc);
priv->text_width = (double) line_width;
priv->text_height = (double) line_height;
priv->text_width = item->canvas->pixels_per_unit * line_width;
priv->text_height = item->canvas->pixels_per_unit * (double) line_height;
}
/* draw the icon item */
......@@ -744,7 +744,7 @@ nautilus_icons_view_icon_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable
}
/* now compute the position of the label and draw it */
icon_height = priv->pixbuf->art_pixbuf->height;
icon_height = priv->pixbuf->art_pixbuf->height * item->canvas->pixels_per_unit;
nautilus_icons_view_draw_text_box(item, drawable, title_font, priv->label, item->x1 - x,
item->y1 - y + icon_height, priv->is_selected, TRUE);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment