summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGene Z. Ragan <gzr@eazel.com>2001-03-14 18:05:26 +0000
committerGene Ragan <gzr@src.gnome.org>2001-03-14 18:05:26 +0000
commit959703aa4a52d0223571ad80bcdb91af366eaff2 (patch)
tree52f1119259b37407805e24b99fe6ab3f8cec139a
parent0805af3e24e6e9e72677e54224c14e240ce42b52 (diff)
downloadnautilus-959703aa4a52d0223571ad80bcdb91af366eaff2.tar.gz
Fixed a minor annoying layout bug on the desktop. When icons were placed
2001-03-14 Gene Z. Ragan <gzr@eazel.com> * libnautilus-extensions/nautilus-icon-container.c: (icon_set_position): Fixed a minor annoying layout bug on the desktop. When icons were placed near the bottom of the desktop, they would sometimes jump partially offscreen.
-rw-r--r--ChangeLog8
-rw-r--r--libnautilus-extensions/nautilus-icon-container.c5
-rw-r--r--libnautilus-private/nautilus-icon-container.c5
3 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 771240157..1834d823c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-03-14 Gene Z. Ragan <gzr@eazel.com>
+
+ * libnautilus-extensions/nautilus-icon-container.c:
+ (icon_set_position):
+ Fixed a minor annoying layout bug on the desktop. When icons were placed
+ near the bottom of the desktop, they would sometimes jump
+ partially offscreen.
+
2001-03-14 John Sullivan <sullivan@eazel.com>
Fixed bug 7696 ("Find" does nothing if location bar hidden)
diff --git a/libnautilus-extensions/nautilus-icon-container.c b/libnautilus-extensions/nautilus-icon-container.c
index a33305bc7..56c8154dd 100644
--- a/libnautilus-extensions/nautilus-icon-container.c
+++ b/libnautilus-extensions/nautilus-icon-container.c
@@ -234,13 +234,14 @@ icon_set_position (NautilusIcon *icon,
width = x2 - x1;
height = y2 - y1;
- if (x > right) {
+ if (x > right - DESKTOP_ICON_SAFETY_PAD) {
x = right - DESKTOP_ICON_SAFETY_PAD;
}
+
if (x < left) {
x = left;
}
- if (y > bottom - height) {
+ if (y > bottom - DESKTOP_ICON_SAFETY_PAD) {
y = bottom - DESKTOP_ICON_SAFETY_PAD;
}
if (y < top) {
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index a33305bc7..56c8154dd 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -234,13 +234,14 @@ icon_set_position (NautilusIcon *icon,
width = x2 - x1;
height = y2 - y1;
- if (x > right) {
+ if (x > right - DESKTOP_ICON_SAFETY_PAD) {
x = right - DESKTOP_ICON_SAFETY_PAD;
}
+
if (x < left) {
x = left;
}
- if (y > bottom - height) {
+ if (y > bottom - DESKTOP_ICON_SAFETY_PAD) {
y = bottom - DESKTOP_ICON_SAFETY_PAD;
}
if (y < top) {