diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | calendar/ChangeLog | 6 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 1 | ||||
| -rw-r--r-- | calendar/gui/gnome-cal.c | 16 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | e-util/Makefile.am | 2 | ||||
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/Makefile.am | 1 | ||||
| -rw-r--r-- | mail/folder-browser.c | 9 | ||||
| -rw-r--r-- | shell/ChangeLog | 6 | ||||
| -rw-r--r-- | shell/Makefile.am | 1 | ||||
| -rw-r--r-- | shell/e-shell-view.c | 30 | ||||
| -rw-r--r-- | tests/ui-tests/message-browser.c | 8 | ||||
| -rw-r--r-- | widgets/Makefile.am | 1 | ||||
| -rw-r--r-- | widgets/e-paned/.cvsignore | 8 | ||||
| -rw-r--r-- | widgets/e-paned/Makefile.am | 15 | ||||
| -rw-r--r-- | widgets/e-paned/e-hpaned.c | 403 | ||||
| -rw-r--r-- | widgets/e-paned/e-hpaned.h | 72 | ||||
| -rw-r--r-- | widgets/e-paned/e-paned.c | 587 | ||||
| -rw-r--r-- | widgets/e-paned/e-paned.h | 124 | ||||
| -rw-r--r-- | widgets/e-paned/e-vpaned.c | 403 | ||||
| -rw-r--r-- | widgets/e-paned/e-vpaned.h | 72 | ||||
| -rw-r--r-- | widgets/shortcut-bar/ChangeLog | 6 | ||||
| -rw-r--r-- | widgets/shortcut-bar/Makefile.am | 1 | ||||
| -rw-r--r-- | widgets/shortcut-bar/test-shortcut-bar.c | 12 |
25 files changed, 1771 insertions, 36 deletions
@@ -1,3 +1,19 @@ +2000-05-24 Christopher James Lahey <clahey@helixcode.com> + + * configure.in: Added widgets/e-paned/Makefile. + + * tests/ui-tests/message-browser.c: Switched from GtkPaned to + EPaned. + + * widgets/Makefile.am: Added e-paned directory. + + * widgets/e-paned/, widgets/e-paned/.cvsignore, + widgets/e-paned/Makefile.am, widgets/e-paned/e-hpaned.c, + widgets/e-paned/e-hpaned.h, widgets/e-paned/e-paned.c, + widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c, + widgets/e-paned/e-vpaned.h: New widget based completely on + GtkPaned from 1.4. This will be more advanced soon. + 2000-05-22 Jeff Stedfast <fejj@helixcode.com> * configure.in: Readded camel/providers/smtp diff --git a/calendar/ChangeLog b/calendar/ChangeLog index a79bb456e7..e8c682efe9 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2000-05-24 Christopher James Lahey <clahey@helixcode.com> + + * gui/Makefile.am: Added libepaned.a. + + * gui/gnome-cal.c: Switched from GtkPaned to EPaned. + 2000-05-22 Federico Mena Quintero <federico@helixcode.com> * gui/calendar-commands.c (calendar_get_events_in_range): Removed diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 3e3e392c4f..972cb893fd 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -24,6 +24,7 @@ LINK_FLAGS = \ $(top_builddir)/calendar/cal-client/libcal-client.la \ $(top_builddir)/calendar/cal-util/libcal-util.la \ $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/e-paned/libepaned.a \ $(top_builddir)/widgets/e-text/libetext.a \ $(top_builddir)/libversit/libversit.la \ $(top_builddir)/libical/src/libical/libical.la diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index f189d5a124..a38b1ca1cb 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -12,12 +12,12 @@ #include <sys/wait.h> #include <fcntl.h> #include <gtk/gtkframe.h> -#include <gtk/gtkhpaned.h> +#include <widgets/e-paned/e-hpaned.h> #include <gtk/gtklabel.h> #include <gtk/gtkmain.h> #include <gtk/gtknotebook.h> #include <gtk/gtkscrolledwindow.h> -#include <gtk/gtkvpaned.h> +#include <widgets/e-paned/e-vpaned.h> #include <libgnomeui/gnome-messagebox.h> #include <cal-util/timeutil.h> #include "dialogs/alarm-notify-dialog.h" @@ -159,7 +159,7 @@ setup_widgets (GnomeCalendar *gcal) /* The First Page of the Main Notebook, containing a HPaned with the Sub-Notebook on the left and the GtkCalendar and ToDo list on the right. */ - gcal->hpane = gtk_hpaned_new (); + gcal->hpane = e_hpaned_new (); gtk_widget_show (gcal->hpane); gtk_notebook_append_page (GTK_NOTEBOOK (gcal->main_notebook), gcal->hpane, gtk_label_new ("")); @@ -170,19 +170,19 @@ setup_widgets (GnomeCalendar *gcal) FALSE); gtk_notebook_set_show_tabs (GTK_NOTEBOOK (gcal->sub_notebook), FALSE); gtk_widget_show (gcal->sub_notebook); - gtk_paned_pack1 (GTK_PANED (gcal->hpane), gcal->sub_notebook, + e_paned_pack1 (E_PANED (gcal->hpane), gcal->sub_notebook, TRUE, TRUE); /* The VPaned widget, to contain the GtkCalendar & ToDo list. */ - vpane = gtk_vpaned_new (); + vpane = e_vpaned_new (); gtk_widget_show (vpane); - gtk_paned_pack2 (GTK_PANED (gcal->hpane), vpane, FALSE, TRUE); + e_paned_pack2 (E_PANED (gcal->hpane), vpane, FALSE, TRUE); /* The GtkCalendar. */ w = gtk_calendar_new (); gcal->gtk_calendar = GTK_CALENDAR (w); gtk_widget_show (w); - gtk_paned_pack1 (GTK_PANED (vpane), w, FALSE, TRUE); + e_paned_pack1 (E_PANED (vpane), w, FALSE, TRUE); gcal->day_selected_id = gtk_signal_connect (GTK_OBJECT (gcal->gtk_calendar), "day_selected", (GtkSignalFunc) gnome_calendar_on_day_selected, @@ -193,7 +193,7 @@ setup_widgets (GnomeCalendar *gcal) /* The ToDo list. */ gcal->todo = gncal_todo_new (gcal); - gtk_paned_pack2 (GTK_PANED (vpane), gcal->todo, TRUE, TRUE); + e_paned_pack2 (E_PANED (vpane), gcal->todo, TRUE, TRUE); gtk_widget_show (gcal->todo); diff --git a/configure.in b/configure.in index 097465fa3e..f9e7096da3 100644 --- a/configure.in +++ b/configure.in @@ -435,6 +435,7 @@ camel/providers/smtp/Makefile camel/providers/vee/Makefile composer/Makefile widgets/Makefile +widgets/e-paned/Makefile widgets/e-table/Makefile widgets/e-text/Makefile widgets/meeting-time-sel/Makefile diff --git a/e-util/Makefile.am b/e-util/Makefile.am index a3db4c74ab..cfed75a936 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -20,8 +20,6 @@ libeutil_la_SOURCES = \ e-gui-utils.h \ e-html-utils.c \ e-html-utils.h \ - e-paned.c \ - e-paned.h \ e-popup-menu.c \ e-popup-menu.h \ e-setup.c \ diff --git a/mail/ChangeLog b/mail/ChangeLog index d795771850..a9d44019fc 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2000-05-24 Christopher James Lahey <clahey@helixcode.com> + + * Makefile.am: Added libepaned.a. + + * folder-browser.c: Switched from GtkPaned to EPaned. + 2000-05-23 Ettore Perazzoli <ettore@helixcode.com> * Makefile.am: Don't link to `evolution-service-repository.o' diff --git a/mail/Makefile.am b/mail/Makefile.am index 1fdb0d3e73..2666edc1bb 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -52,6 +52,7 @@ evolution_mail_LDADD = \ ../shell/Evolution-stubs.o \ ../shell/Evolution-skels.o \ ../composer/libcomposer.la \ + $(top_builddir)/widgets/e-paned/libepaned.a \ ../widgets/e-table/libetable.a \ ../widgets/e-text/libetext.a \ ../camel/libcamel.la \ diff --git a/mail/folder-browser.c b/mail/folder-browser.c index 292c22d5d7..297279c73f 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -13,6 +13,7 @@ #include "folder-browser.h" #include "mail.h" #include "message-list.h" +#include <widgets/e-paned/e-vpaned.h> #define PARENT_TYPE (gtk_table_get_type ()) @@ -315,7 +316,7 @@ folder_browser_gui_init (FolderBrowser *fb) /* * The panned container */ - fb->vpaned = gtk_vpaned_new (); + fb->vpaned = e_vpaned_new (); gtk_widget_show (fb->vpaned); gtk_table_attach ( @@ -346,11 +347,11 @@ folder_browser_gui_init (FolderBrowser *fb) 0, 0); fb->message_list_w = message_list_get_widget (fb->message_list); - gtk_paned_add1 (GTK_PANED (fb->vpaned), fb->message_list_w); + e_paned_add1 (E_PANED (fb->vpaned), fb->message_list_w); gtk_widget_show (fb->message_list_w); - gtk_paned_add2 (GTK_PANED (fb->vpaned), GTK_WIDGET (fb->mail_display)); - gtk_paned_set_position (GTK_PANED (fb->vpaned), 200); + e_paned_add2 (E_PANED (fb->vpaned), GTK_WIDGET (fb->mail_display)); + e_paned_set_position (E_PANED (fb->vpaned), 200); gtk_widget_show (GTK_WIDGET (fb->mail_display)); gtk_widget_show (GTK_WIDGET (fb)); diff --git a/shell/ChangeLog b/shell/ChangeLog index cb23544111..26a88bb1cb 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2000-05-24 Christopher James Lahey <clahey@helixcode.com> + + * Makefile.am: Added libepaned.a. + + * e-shell-view.c: Switched from GtkPaned to EPaned. + 2000-05-23 Ettore Perazzoli <ettore@helixcode.com> * e-shell.c: New member `corba_storage_registry' in diff --git a/shell/Makefile.am b/shell/Makefile.am index a62fb41abd..10a7404035 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -73,6 +73,7 @@ $(EVOLUTION_CORBA_GENERATED): $(IDLS) evolution_LDADD = \ $(top_builddir)/widgets/shortcut-bar/libshortcut-bar.a \ + $(top_builddir)/widgets/e-paned/libepaned.a \ $(top_builddir)/widgets/e-text/libetext.a \ $(top_builddir)/widgets/misc/libemiscwidgets.a \ $(top_builddir)/e-util/libeutil.la \ diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index f3dd6d1a9d..8f6e0a307e 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -42,6 +42,8 @@ #include "e-shell-view.h" #include "e-shell-view-menu.h" +#include <widgets/e-paned/e-paned.h> + #define PARENT_TYPE gnome_app_get_type () /* Losing GnomeApp does not define GNOME_TYPE_APP. */ static GnomeAppClass *parent_class = NULL; @@ -255,15 +257,15 @@ setup_widgets (EShellView *shell_view) /* Put things into a paned and the paned into the GnomeApp. */ - priv->hpaned2 = gtk_hpaned_new (); - gtk_paned_add1 (GTK_PANED (priv->hpaned2), priv->storage_set_view_box); - gtk_paned_add2 (GTK_PANED (priv->hpaned2), priv->notebook); - gtk_paned_set_position (GTK_PANED (priv->hpaned2), DEFAULT_SHORTCUT_BAR_WIDTH); + priv->hpaned2 = e_hpaned_new (); + e_paned_add1 (E_PANED (priv->hpaned2), priv->storage_set_view_box); + e_paned_add2 (E_PANED (priv->hpaned2), priv->notebook); + e_paned_set_position (E_PANED (priv->hpaned2), DEFAULT_SHORTCUT_BAR_WIDTH); - priv->hpaned1 = gtk_hpaned_new (); - gtk_paned_add1 (GTK_PANED (priv->hpaned1), priv->shortcut_bar_box); - gtk_paned_add2 (GTK_PANED (priv->hpaned1), priv->hpaned2); - gtk_paned_set_position (GTK_PANED (priv->hpaned1), DEFAULT_SHORTCUT_BAR_WIDTH); + priv->hpaned1 = e_hpaned_new (); + e_paned_add1 (E_PANED (priv->hpaned1), priv->shortcut_bar_box); + e_paned_add2 (E_PANED (priv->hpaned1), priv->hpaned2); + e_paned_set_position (E_PANED (priv->hpaned1), DEFAULT_SHORTCUT_BAR_WIDTH); gtk_container_set_border_width (GTK_CONTAINER (priv->hpaned1), 0); gtk_container_set_border_width (GTK_CONTAINER (priv->hpaned2), 0); @@ -762,14 +764,14 @@ e_shell_view_show_shortcuts (EShellView *shell_view, if (show) { if (! GTK_WIDGET_VISIBLE (priv->shortcut_bar_box)) { gtk_widget_show (priv->shortcut_bar_box); - gtk_paned_set_position (GTK_PANED (priv->hpaned1), priv->hpaned1_position); + e_paned_set_position (E_PANED (priv->hpaned1), priv->hpaned1_position); } } else { if (GTK_WIDGET_VISIBLE (priv->shortcut_bar_box)) { gtk_widget_hide (priv->shortcut_bar_box); /* FIXME this is a private field! */ - priv->hpaned1_position = GTK_PANED (priv->hpaned1)->child1_size; - gtk_paned_set_position (GTK_PANED (priv->hpaned1), 0); + priv->hpaned1_position = E_PANED (priv->hpaned1)->child1_size; + e_paned_set_position (E_PANED (priv->hpaned1), 0); } } } @@ -788,14 +790,14 @@ e_shell_view_show_folders (EShellView *shell_view, if (show) { if (! GTK_WIDGET_VISIBLE (priv->storage_set_view_box)) { gtk_widget_show (priv->storage_set_view_box); - gtk_paned_set_position (GTK_PANED (priv->hpaned2), priv->hpaned2_position); + e_paned_set_position (E_PANED (priv->hpaned2), priv->hpaned2_position); } } else { if (GTK_WIDGET_VISIBLE (priv->storage_set_view_box)) { gtk_widget_hide (priv->storage_set_view_box); /* FIXME this is a private field! */ - priv->hpaned2_position = GTK_PANED (priv->hpaned2)->child1_size; - gtk_paned_set_position (GTK_PANED (priv->hpaned2), 0); + priv->hpaned2_position = E_PANED (priv->hpaned2)->child1_size; + e_paned_set_position (E_PANED (priv->hpaned2), 0); } } } diff --git a/tests/ui-tests/message-browser.c b/tests/ui-tests/message-browser.c index 86625259fe..fb12b959d9 100644 --- a/tests/ui-tests/message-browser.c +++ b/tests/ui-tests/message-browser.c @@ -36,6 +36,8 @@ #include <libgnorba/gnorba.h> #include <bonobo/bonobo-stream-memory.h> +#include <widgets/e-paned/e-hpaned.h> + static void print_usage_and_quit() { @@ -791,15 +793,15 @@ main (int argc, char *argv[]) } } - hpane = gtk_hpaned_new(); + hpane = e_hpaned_new(); /* add the tree control view of the message*/ tree_ctrl_window = get_message_tree_ctrl (message); - gtk_paned_add1 (GTK_PANED (hpane), tree_ctrl_window); + e_paned_add1 (E_PANED (hpane), tree_ctrl_window); /* add the HTML view of the message */ html_window = get_gtk_html_window (message); - gtk_paned_add2 (GTK_PANED (hpane), html_window); + e_paned_add2 (E_PANED (hpane), html_window); /* rock n roll */ gnome_app_set_contents (GNOME_APP (app), diff --git a/widgets/Makefile.am b/widgets/Makefile.am index 9ffbf1cf41..a140d09102 100644 --- a/widgets/Makefile.am +++ b/widgets/Makefile.am @@ -1,5 +1,6 @@ SUBDIRS = \ + e-paned \ e-text \ e-table \ meeting-time-sel \ diff --git a/widgets/e-paned/.cvsignore b/widgets/e-paned/.cvsignore new file mode 100644 index 0000000000..955fc0b6d0 --- /dev/null +++ b/widgets/e-paned/.cvsignore @@ -0,0 +1,8 @@ +.deps +.libs +.pure +Makefile +Makefile.in +*.lo +*.la +libepaned.a diff --git a/widgets/e-paned/Makefile.am b/widgets/e-paned/Makefile.am new file mode 100644 index 0000000000..51ab38c80d --- /dev/null +++ b/widgets/e-paned/Makefile.am @@ -0,0 +1,15 @@ +INCLUDES = \ + -I$(top_srcdir) \ + $(GNOME_INCLUDEDIR) \ + -DG_LOG_DOMAIN=\"e-paned\" + +noinst_LIBRARIES = \ + libepaned.a + +libepaned_a_SOURCES = \ + e-hpaned.c \ + e-hpaned.h \ + e-paned.c \ + e-paned.h \ + e-vpaned.c \ + e-vpaned.h diff --git a/widgets/e-paned/e-hpaned.c b/widgets/e-paned/e-hpaned.c new file mode 100644 index 0000000000..b43630fff0 --- /dev/null +++ b/widgets/e-paned/e-hpaned.c @@ -0,0 +1,403 @@ +/* EPaned - A slightly more advanced paned widget. + * Copyright (C) 2000 Helix Code, Inc. + * + * Author: Christopher James Lahey <clahey@helixcode.com> + * + * based on GtkPaned from Gtk+. Gtk+ Copyright notice follows. + */ + +/* GTK - The GIMP Toolkit + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* + * Modified by the GTK+ Team and others 1997-1999. See the AUTHORS + * file for a list of people on the GTK+ Team. See the ChangeLog + * files for a list of changes. These files are distributed with + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + */ + +#include "e-hpaned.h" + +static void e_hpaned_class_init (EHPanedClass *klass); +static void e_hpaned_init (EHPaned *hpaned); +static void e_hpaned_size_request (GtkWidget *widget, + GtkRequisition *requisition); +static void e_hpaned_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); +static void e_hpaned_draw (GtkWidget *widget, + GdkRectangle *area); +static void e_hpaned_xor_line (EPaned *paned); +static gboolean e_hpaned_button_press (GtkWidget *widget, + GdkEventButton *event); +static gboolean e_hpaned_button_release (GtkWidget *widget, + GdkEventButton *event); +static gboolean e_hpaned_motion (GtkWidget *widget, + GdkEventMotion *event); + +GtkType +e_hpaned_get_type (void) +{ + static GtkType hpaned_type = 0; + + if (!hpaned_type) + { + static const GtkTypeInfo hpaned_info = + { + "EHPaned", + sizeof (EHPaned), + sizeof (EHPanedClass), + (GtkClassInitFunc) e_hpaned_class_init, + (GtkObjectInitFunc) e_hpaned_init, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, + (GtkClassInitFunc) NULL, + }; + + hpaned_type = gtk_type_unique (E_TYPE_PANED, &hpaned_info); + } + + return hpaned_type; +} + +static void +e_hpaned_class_init (EHPanedClass *class) +{ + GtkWidgetClass *widget_class; + + widget_class = (GtkWidgetClass *) class; + + widget_class->size_request = e_hpaned_size_request; + widget_class->size_allocate = e_hpaned_size_allocate; + widget_class->draw = e_hpaned_draw; + widget_class->button_press_event = e_hpaned_button_press; + widget_class->button_release_event = e_hpaned_button_release; + widget_class->motion_notify_event = e_hpaned_motion; +} + +static void +e_hpaned_init (EHPaned *hpaned) +{ + EPaned *paned; + + g_return_if_fail (hpaned != NULL); + g_return_if_fail (E_IS_PANED (hpaned)); + + paned = E_PANED (hpaned); + + paned->cursor_type = GDK_SB_H_DOUBLE_ARROW; +} + +GtkWidget * +e_hpaned_new (void) +{ + EHPaned *hpaned; + + hpaned = gtk_type_new (E_TYPE_HPANED); + + return GTK_WIDGET (hpaned); +} + +static void +e_hpaned_size_request (GtkWidget *widget, + GtkRequisition *requisition) +{ + EPaned *paned; + GtkRequisition child_requisition; + + g_return_if_fail (widget != NULL); + g_return_if_fail (E_IS_HPANED (widget)); + g_return_if_fail (requisition != NULL); + + paned = E_PANED (widget); + requisition->width = 0; + requisition->height = 0; + + if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1)) + { + gtk_widget_size_request (paned->child1, &child_requisition); + + requisition->height = child_requisition.height; + requisition->width = child_requisition.width; + } + + if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2)) + { + gtk_widget_size_request (paned->child2, &child_requisition); + + requisition->height = MAX(requisition->height, child_requisition.height); + requisition->width += child_requisition.width; + } + + requisition->width += GTK_CONTAINER (paned)->border_width * 2 + paned->handle_size; + requisition->height += GTK_CONTAINER (paned)->border_width * 2; +} + +static void +e_hpaned_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + EPaned *paned; + GtkRequisition child1_requisition; + GtkRequisition child2_requisition; + GtkAllocation child1_allocation; + GtkAllocation child2_allocation; + gint border_width; + + g_return_if_fail (widget != NULL); + g_return_if_fail (E_IS_HPANED (widget)); + g_return_if_fail (allocation != NULL); + + widget->allocation = *allocation; + paned = E_PANED (widget); + border_width = GTK_CONTAINER (paned)->border_width; + + if (paned->child1) + gtk_widget_get_child_requisition (paned->child1, &child1_requisition); + else + child1_requisition.width = 0; + + if (paned->child2) + gtk_widget_get_child_requisition (paned->child2, &child2_requisition); + else + child2_requisition.width = 0; + + e_paned_compute_position (paned, + MAX (1, (gint) widget->allocation.width + - (gint) paned->handle_size + - 2 * border_width), + child1_requisition.width, + child2_requisition.width); + + /* Move the handle before the children so we don't get extra expose events */ + + paned->handle_xpos = paned->child1_size + border_width; + paned->handle_ypos = border_width; + paned->handle_width = paned->handle_size; + paned->handle_height = MAX (1, (gint) widget->allocation.height - 2 * border_width); + + if (GTK_WIDGET_REALIZED (widget)) + { + gdk_window_move_resize (widget->window, + allocation->x, allocation->y, + allocation->width, + allocation->height); + + gdk_window_move_resize (paned->handle, + paned->handle_xpos, + paned->handle_ypos, + paned->handle_size, + paned->handle_height); + } + + child1_allocation.height = child2_allocation.height = MAX (1, (gint) allocation->height - border_width * 2); + child1_allocation.width = paned->child1_size; + child1_allocation.x = border_width; + child1_allocation.y = child2_allocation.y = border_width; + + child2_allocation.x = child1_allocation.x + child1_allocation.width + paned->handle_width; + child2_allocation.width = MAX (1, (gint) allocation->width - child2_allocation.x - border_width); + + /* Now allocate the childen, making sure, when resizing not to + * overlap the windows */ + if (GTK_WIDGET_MAPPED (widget) && + paned->child1 && GTK_WIDGET_VISIBLE (paned->child1) && + paned->child1->allocation.width < child1_allocation.width) + { + if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2)) + gtk_widget_size_allocate (paned->child2, &child2_allocation); + gtk_widget_size_allocate (paned->child1, &child1_allocation); + } + else + { + if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1)) + gtk_widget_size_allocate (paned->child1, &child1_allocation); + if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2)) + gtk_widget_size_allocate (paned->child2, &child2_allocation); + } +} + +static void +e_hpaned_draw (GtkWidget *widget, + GdkRectangle *area) +{ + EPaned *paned; + GdkRectangle handle_area, child_area; + guint16 border_width; + + g_return_if_fail (widget != NULL); + g_return_if_fail (E_IS_PANED (widget)); + + if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget)) + { + paned = E_PANED (widget); + border_width = GTK_CONTAINER (paned)->border_width; + + gdk_window_clear_area (widget->window, + area->x, area->y, area->width, + area->height); + + handle_area.x = paned->handle_xpos; + handle_area.y = paned->handle_ypos; + handle_area.width = paned->handle_size; + handle_area.height = paned->handle_height; + + if (gdk_rectangle_intersect (&handle_area, area, &child_area)) + { + child_area.x -= paned->handle_xpos; + child_area.y -= paned->handle_ypos; + + gtk_paint_handle (widget->style, + paned->handle, + GTK_STATE_NORMAL, + GTK_SHADOW_NONE, + &child_area, + widget, + "paned", + 0, 0, -1, -1, + GTK_ORIENTATION_VERTICAL); + + } + /* Redraw the children + */ + if (paned->child1 && gtk_widget_intersect (paned->child1, area, &child_area)) + gtk_widget_draw(paned->child1, &child_area); + if (paned->child2 && gtk_widget_intersect(paned->child2, area, &child_area)) + gtk_widget_draw(paned->child2, &child_area); + } +} + +static void +e_hpaned_xor_line (EPaned *paned) +{ + GtkWidget *widget; + GdkGCValues values; + guint16 xpos; + + widget = GTK_WIDGET(paned); + + if (!paned->xor_gc) + { + values.function = GDK_INVERT; + values.subwindow_mode = GDK_INCLUDE_INFERIORS; + paned->xor_gc = gdk_gc_new_with_values (widget->window, + &values, + GDK_GC_FUNCTION | GDK_GC_SUBWINDOW); + } + + gdk_gc_set_line_attributes (paned->xor_gc, 2, GDK_LINE_SOLID, + GDK_CAP_NOT_LAST, GDK_JOIN_BEVEL); + + xpos = paned->child1_size + + GTK_CONTAINER (paned)->border_width + paned->handle_size / 2; + + gdk_draw_line (widget->window, paned->xor_gc, + xpos, + 0, + xpos, + widget->allocation.height - 1); +} + +static gboolean +e_hpaned_button_press (GtkWidget *widget, + GdkEventButton *event) +{ + EPaned *paned; + + g_return_val_if_fail (widget != NULL, FALSE); + g_return_val_if_fail (E_IS_PANED (widget), FALSE); + + paned = E_PANED (widget); + + if (!paned->in_drag && + event->window == paned->handle && event->button == 1) + { + paned->in_drag = TRUE; + /* We need a server grab here, not gtk_grab_add(), since + * we don't want to pass events on to the widget's children */ + gdk_pointer_grab(paned->handle, FALSE, + GDK_POINTER_MOTION_HINT_MASK + | GDK_BUTTON1_MOTION_MASK + | GDK_BUTTON_RELEASE_MASK, + NULL, NULL, event->time); + paned->child1_size += event->x - paned->handle_size / 2; + paned->child1_size = CLAMP (paned->child1_size, 0, + widget->allocation.width + - paned->handle_size + - 2 * GTK_CONTAINER (paned)->border_width); + e_hpaned_xor_line (paned); + + return TRUE; + } + + return FALSE; +} + +static gboolean +e_hpaned_button_release (GtkWidget *widget, + GdkEventButton *event) +{ + EPaned *paned; + + g_return_val_if_fail (widget != NULL, FALSE); + g_return_val_if_fail (E_IS_PANED (widget), FALSE); + + paned = E_PANED (widget); + + if (paned->in_drag && (event->button == 1)) + { + e_hpaned_xor_line (paned); + paned->in_drag = FALSE; + paned->position_set = TRUE; + gdk_pointer_ungrab (event->time); + gtk_widget_queue_resize (GTK_WIDGET (paned)); + + return TRUE; + } + + return FALSE; +} + +static gboolean +e_hpaned_motion (GtkWidget *widget, + GdkEventMotion *event) +{ + EPaned *paned; + gint x; + + g_return_val_if_fail (widget != NULL, FALSE); + g_return_val_if_fail (E_IS_PANED (widget), FALSE); + + paned = E_PANED (widget); + + if (event->is_hint || event->window != widget->window) + gtk_widget_get_pointer(widget, &x, NULL); + else + x = event->x; + + if (paned->in_drag) + { + gint size = x - GTK_CONTAINER (paned)->border_width - paned->handle_size / 2; + + e_hpaned_xor_line (paned); + paned->child1_size = CLAMP (size, paned->min_position, paned->max_position); + e_hpaned_xor_line (paned); + } + + return TRUE; +} diff --git a/widgets/e-paned/e-hpaned.h b/widgets/e-paned/e-hpaned.h new file mode 100644 index 0000000000..63c09198b1 --- /dev/null +++ b/widgets/e-paned/e-hpaned.h @@ -0,0 +1,72 @@ +/* EPaned - A slightly more advanced paned widget. + * Copyright (C) 2000 Helix Code, Inc. + * + * Author: Christopher James Lahey <clahey@helixcode.com> + * + * based on GtkPaned from Gtk+. Gtk+ Copyright notice follows. + */ + +/* GTK - The GIMP Toolkit + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* + * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS + * file for a list of people on the GTK+ Team. See the ChangeLog + * files for a list of changes. These files are distributed with + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + */ + +#ifndef __E_HPANED_H__ +#define __E_HPANED_H__ + +#include <widgets/e-paned/e-paned.h> + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#define E_TYPE_HPANED (e_hpaned_get_type ()) +#define E_HPANED(obj) (GTK_CHECK_CAST ((obj), E_TYPE_HPANED, EHPaned)) +#define E_HPANED_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_HPANED, EHPanedClass)) +#define E_IS_HPANED(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_HPANED)) +#define E_IS_HPANED_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_HPANED)) +#define E_HPANED_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), E_TYPE_HPANED, EHPanedClass)) + + +typedef struct _EHPaned EHPaned; +typedef struct _EHPanedClass EHPanedClass; + +struct _EHPaned +{ + EPaned paned; +}; + +struct _EHPanedClass +{ + EPanedClass parent_class; +}; + +GtkType e_hpaned_get_type (void); +GtkWidget *e_hpaned_new (void); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __E_HPANED_H__ */ diff --git a/widgets/e-paned/e-paned.c b/widgets/e-paned/e-paned.c new file mode 100644 index 0000000000..f2db002e6e --- /dev/null +++ b/widgets/e-paned/e-paned.c @@ -0,0 +1,587 @@ +/* EPaned - A slightly more advanced paned widget. + * Copyright (C) 2000 Helix Code, Inc. + * + * Author: Christopher James Lahey <clahey@helixcode.com> + * + * based on GtkPaned from Gtk+. Gtk+ Copyright notice follows. + */ + +/* GTK - The GIMP Toolkit + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* + * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS + * file for a list of people on the GTK+ Team. See the ChangeLog + * files for a list of changes. These files are distributed with + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + */ + +#include "e-paned.h" + +enum { + ARG_0, + ARG_HANDLE_SIZE +}; + +static void e_paned_class_init (EPanedClass *klass); +static void e_paned_init (EPaned *paned); +static void e_paned_set_arg (GtkObject *object, + GtkArg *arg, + guint arg_id); +static void e_paned_get_arg (GtkObject *object, + GtkArg *arg, + guint arg_id); +static void e_paned_realize (GtkWidget *widget); +static void e_paned_map (GtkWidget *widget); +static void e_paned_unmap (GtkWidget *widget); +static void e_paned_unrealize (GtkWidget *widget); +static gint e_paned_expose (GtkWidget *widget, + GdkEventExpose *event); +static void e_paned_add (GtkContainer *container, + GtkWidget *widget); +static void e_paned_remove (GtkContainer *container, + GtkWidget *widget); +static void e_paned_forall (GtkContainer *container, + gboolean include_internals, + GtkCallback callback, + gpointer callback_data); +static GtkType e_paned_child_type (GtkContainer *container); + +static GtkContainerClass *parent_class = NULL; + + +GtkType +e_paned_get_type (void) +{ + static GtkType paned_type = 0; + + if (!paned_type) + { + static const GtkTypeInfo paned_info = + { + "EPaned", + sizeof (EPaned), + sizeof (EPanedClass), + (GtkClassInitFunc) e_paned_class_init, + (GtkObjectInitFunc) e_paned_init, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, + (GtkClassInitFunc) NULL, + }; + + paned_type = gtk_type_unique (GTK_TYPE_CONTAINER, &paned_info); + } + + return paned_type; +} + +static void +e_paned_class_init (EPanedClass *class) +{ + GtkObjectClass *object_class; + GtkWidgetClass *widget_class; + GtkContainerClass *container_class; + + object_class = (GtkObjectClass *) class; + widget_class = (GtkWidgetClass *) class; + container_class = (GtkContainerClass *) class; + + parent_class = gtk_type_class (GTK_TYPE_CONTAINER); + + object_class->set_arg = e_paned_set_arg; + object_class->get_arg = e_paned_get_arg; + + widget_class->realize = e_paned_realize; + widget_class->map = e_paned_map; + widget_class->unmap = e_paned_unmap; + widget_class->unrealize = e_paned_unrealize; + widget_class->expose_event = e_paned_expose; + + container_class->add = e_paned_add; + container_class->remove = e_paned_remove; + container_class->forall = e_paned_forall; + container_class->child_type = e_paned_child_type; + + gtk_object_add_arg_type("EPaned::handle_size", GTK_TYPE_UINT, + GTK_ARG_READWRITE, ARG_HANDLE_SIZE); +} + +static GtkType +e_paned_child_type (GtkContainer *container) +{ + if (!E_PANED (container)->child1 || !E_PANED (container)->child2) + return GTK_TYPE_WIDGET; + else + return GTK_TYPE_NONE; +} + +static void +e_paned_init (EPaned *paned) +{ + GTK_WIDGET_UNSET_FLAGS (paned, GTK_NO_WINDOW); + + paned->child1 = NULL; + paned->child2 = NULL; + paned->handle = NULL; + paned->xor_gc = NULL; + paned->cursor_type = GDK_CROSS; + + paned->handle_width = 5; + paned->handle_height = 5; + paned->handle_size = 5; + paned->position_set = FALSE; + paned->last_allocation = -1; + paned->in_drag = FALSE; + + paned->handle_xpos = -1; + paned->handle_ypos = -1; +} + +static void +e_paned_set_arg (GtkObject *object, + GtkArg *arg, + guint arg_id) +{ + EPaned *paned = E_PANED (object); + + switch (arg_id) + { + case ARG_HANDLE_SIZE: + e_paned_set_handle_size (paned, GTK_VALUE_UINT (*arg)); + break; + default: + break; + } +} + +static void +e_paned_get_arg (GtkObject *object, + GtkArg *arg, + guint arg_id) +{ + EPaned *paned = E_PANED (object); + + switch (arg_id) + { + case ARG_HANDLE_SIZE: + GTK_VALUE_UINT (*arg) = paned->handle_size; + break; + default: + arg->type = GTK_TYPE_INVALID; + break; + } +} + +static void +e_paned_realize (GtkWidget *widget) +{ + EPaned *paned; + GdkWindowAttr attributes; + gint attributes_mask; + + g_return_if_fail (widget != NULL); + g_return_if_fail (E_IS_PANED (widget)); + + GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); + paned = E_PANED (widget); + + attributes.x = widget->allocation.x; + attributes.y = widget->allocation.y; + attributes.width = widget->allocation.width; + attributes.height = widget->allocation.height; + attributes.window_type = GDK_WINDOW_CHILD; + attributes.wclass = GDK_INPUT_OUTPUT; + attributes.visual = gtk_widget_get_visual (widget); + attributes.colormap = gtk_widget_get_colormap (widget); + attributes.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK; + attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; + + widget->window = gdk_window_new (gtk_widget_get_parent_window(widget), + &attributes, attributes_mask); + gdk_window_set_user_data (widget->window, paned); + + attributes.x = paned->handle_xpos; + attributes.y = paned->handle_ypos; + attributes.width = paned->handle_width; + attributes.height = paned->handle_height; + attributes.cursor = gdk_cursor_new (paned->cursor_type); + attributes.event_mask |= (GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_RELEASE_MASK | + GDK_POINTER_MOTION_MASK | + GDK_POINTER_MOTION_HINT_MASK); + attributes_mask |= GDK_WA_CURSOR; + + paned->handle = gdk_window_new (widget->window, + &attributes, attributes_mask); + gdk_window_set_user_data (paned->handle, paned); + gdk_cursor_destroy (attributes.cursor); + + widget->style = gtk_style_attach (widget->style, widget->window); + + gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL); + gtk_style_set_background (widget->style, paned->handle, GTK_STATE_NORMAL); + + gdk_window_set_back_pixmap (widget->window, NULL, TRUE); + + gdk_window_show (paned->handle); +} + +static void +e_paned_map (GtkWidget *widget) +{ + EPaned *paned; + + g_return_if_fail (widget != NULL); + g_return_if_fail (E_IS_PANED (widget)); + + GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED); + paned = E_PANED (widget); + + if (paned->child1 && + GTK_WIDGET_VISIBLE (paned->child1) && + !GTK_WIDGET_MAPPED (paned->child1)) + gtk_widget_map (paned->child1); + if (paned->child2 && + GTK_WIDGET_VISIBLE (paned->child2) && + !GTK_WIDGET_MAPPED (paned->child2)) + gtk_widget_map (paned->child2); + + gdk_window_show (widget->window); +} + +static void +e_paned_unmap (GtkWidget *widget) +{ + g_return_if_fail (widget != NULL); + g_return_if_fail (E_IS_PANED (widget)); + + GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED); + + gdk_window_hide (widget->window); +} + +static void +e_paned_unrealize (GtkWidget *widget) +{ + EPaned *paned; + + g_return_if_fail (widget != NULL); + g_return_if_fail (E_IS_PANED (widget)); + + paned = E_PANED (widget); + + if (paned->xor_gc) + { + gdk_gc_destroy (paned->xor_gc); + paned->xor_gc = NULL; + } + + if (paned->handle) + { + gdk_window_set_user_data (paned->handle, NULL); + gdk_window_destroy (paned->handle); + paned->handle = NULL; + } + + if (GTK_WIDGET_CLASS (parent_class)->unrealize) + (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); +} + +static gint +e_paned_expose (GtkWidget *widget, + GdkEventExpose *event) +{ + EPaned *paned; + GdkEventExpose child_event; + + g_return_val_if_fail (widget != NULL, FALSE); + g_return_val_if_fail (E_IS_PANED (widget), FALSE); + g_return_val_if_fail (event != NULL, FALSE); + + if (GTK_WIDGET_DRAWABLE (widget)) + { + paned = E_PANED (widget); + + if (event->window == paned->handle) + { + child_event = *event; + event->area.x += paned->handle_xpos; + event->area.y += paned->handle_ypos; + gtk_widget_draw (widget, &event->area); + } + else + { + child_event = *event; + if (paned->child1 && + GTK_WIDGET_NO_WINDOW (paned->child1) && + gtk_widget_intersect (paned->child1, &event->area, &child_event.area)) + gtk_widget_event (paned->child1, (GdkEvent *) &child_event); + + if (paned->child2 && + GTK_WIDGET_NO_WINDOW (paned->child2) && + gtk_widget_intersect (paned->child2, &event->area, &child_event.area)) + gtk_widget_event (paned->child2, (GdkEvent *) &child_event); + } + } + + return FALSE; +} + +void +e_paned_add1 (EPaned *paned, + GtkWidget *widget) +{ + e_paned_pack1 (paned, widget, FALSE, TRUE); +} + +void +e_paned_add2 (EPaned *paned, + GtkWidget *widget) +{ + e_paned_pack2 (paned, widget, TRUE, TRUE); +} + +void +e_paned_pack1 (EPaned *paned, + GtkWidget *child, + gboolean resize, + gboolean shrink) +{ + g_return_if_fail (paned != NULL); + g_return_if_fail (E_IS_PANED (paned)); + g_return_if_fail (GTK_IS_WIDGET (child)); + + if (!paned->child1) + { + paned->child1 = child; + paned->child1_resize = resize; + paned->child1_shrink = shrink; + + gtk_widget_set_parent (child, GTK_WIDGET (paned)); + + if (GTK_WIDGET_REALIZED (child->parent)) + gtk_widget_realize (child); + + if (GTK_WIDGET_VISIBLE (child->parent) && GTK_WIDGET_VISIBLE (child)) + { + if (GTK_WIDGET_MAPPED (child->parent)) + gtk_widget_map (child); + + gtk_widget_queue_resize (child); + } + } +} + +void +e_paned_pack2 (EPaned *paned, + GtkWidget *child, + gboolean resize, + gboolean shrink) +{ + g_return_if_fail (paned != NULL); + g_return_if_fail (E_IS_PANED (paned)); + g_return_if_fail (GTK_IS_WIDGET (child)); + + if (!paned->child2) + { + paned->child2 = child; + paned->child2_resize = resize; + paned->child2_shrink = shrink; + + gtk_widget_set_parent (child, GTK_WIDGET (paned)); + + if (GTK_WIDGET_REALIZED (child->parent)) + gtk_widget_realize (child); + + if (GTK_WIDGET_VISIBLE (child->parent) && GTK_WIDGET_VISIBLE (child)) + { + if (GTK_WIDGET_MAPPED (child->parent)) + gtk_widget_map (child); + + gtk_widget_queue_resize (child); + } + } +} + + +static void +e_paned_add (GtkContainer *container, + GtkWidget *widget) +{ + EPaned *paned; + + g_return_if_fail (container != NULL); + g_return_if_fail (E_IS_PANED (container)); + g_return_if_fail (widget != NULL); + + paned = E_PANED (container); + + if (!paned->child1) + e_paned_add1 (E_PANED (container), widget); + else if (!paned->child2) + e_paned_add2 (E_PANED (container), widget); +} + +static void +e_paned_remove (GtkContainer *container, + GtkWidget *widget) +{ + EPaned *paned; + gboolean was_visible; + + g_return_if_fail (container != NULL); + g_return_if_fail (E_IS_PANED (container)); + g_return_if_fail (widget != NULL); + + paned = E_PANED (container); + was_visible = GTK_WIDGET_VISIBLE (widget); + + if (paned->child1 == widget) + { + gtk_widget_unparent (widget); + + paned->child1 = NULL; + + if (was_visible && GTK_WIDGET_VISIBLE (container)) + gtk_widget_queue_resize (GTK_WIDGET (container)); + } + else if (paned->child2 == widget) + { + gtk_widget_unparent (widget); + + paned->child2 = NULL; + + if (was_visible && GTK_WIDGET_VISIBLE (container)) + gtk_widget_queue_resize (GTK_WIDGET (container)); + } +} + +static void +e_paned_forall (GtkContainer *container, + gboolean include_internals, + GtkCallback callback, + gpointer callback_data) +{ + EPaned *paned; + + g_return_if_fail (container != NULL); + g_return_if_fail (E_IS_PANED (container)); + g_return_if_fail (callback != NULL); + + paned = E_PANED (container); + + if (paned->child1) + (*callback) (paned->child1, callback_data); + if (paned->child2) + (*callback) (paned->child2, callback_data); +} + +gint +e_paned_get_position (EPaned *paned) +{ + g_return_val_if_fail (paned != NULL, 0); + g_return_val_if_fail (E_IS_PANED (paned), 0); + + return paned->child1_size; +} + +void +e_paned_set_position (EPaned *paned, + gint position) +{ + g_return_if_fail (paned != NULL); + g_return_if_fail (E_IS_PANED (paned)); + + if (position >= 0) + { + /* We don't clamp here - the assumption is that + * if the total allocation changes at the same time + * as the position, the position set is with reference + * to the new total size. If only the position changes, + * then clamping will occur in e_paned_compute_position() + */ + paned->child1_size = position; + paned->position_set = TRUE; + } + else + { + paned->position_set = FALSE; + } + + gtk_widget_queue_resize (GTK_WIDGET (paned)); +} + +void +e_paned_set_handle_size (EPaned *paned, + guint16 size) +{ + g_return_if_fail (paned != NULL); + g_return_if_fail (E_IS_PANED (paned)); + + gtk_widget_queue_resize (GTK_WIDGET (paned)); + + paned->handle_size = size; +} + +void +e_paned_compute_position(EPaned *paned, + gint allocation, + gint child1_req, + gint child2_req) +{ + g_return_if_fail (paned != NULL); + g_return_if_fail (E_IS_PANED (paned)); + + paned->min_position = paned->child1_shrink ? 0 : child1_req; + + paned->max_position = allocation; + if (!paned->child2_shrink) + paned->max_position = MAX (1, paned->max_position - child2_req); + + if (!paned->position_set) + { + if (paned->child1_resize && !paned->child2_resize) + paned->child1_size = MAX (1, allocation - child2_req); + else if (!paned->child1_resize && paned->child2_resize) + paned->child1_size = child1_req; + else if (child1_req + child2_req != 0) + paned->child1_size = allocation * ((gdouble)child1_req / (child1_req + child2_req)); + else + paned->child1_size = allocation * 0.5; + } + else + { + /* If the position was set before the initial allocation. + * (paned->last_allocation <= 0) just clamp it and leave it. + */ + if (paned->last_allocation > 0) + { + if (paned->child1_resize && !paned->child2_resize) + paned->child1_size += allocation - paned->last_allocation; + else if (!(!paned->child1_resize && paned->child2_resize)) + paned->child1_size = allocation * ((gdouble) paned->child1_size / (paned->last_allocation)); + } + } + + paned->child1_size = CLAMP (paned->child1_size, + paned->min_position, + paned->max_position); + + paned->last_allocation = allocation; +} diff --git a/widgets/e-paned/e-paned.h b/widgets/e-paned/e-paned.h new file mode 100644 index 0000000000..2b07a24bda --- /dev/null +++ b/widgets/e-paned/e-paned.h @@ -0,0 +1,124 @@ +/* EPaned - A slightly more advanced paned widget. + * Copyright (C) 2000 Helix Code, Inc. + * + * Author: Christopher James Lahey <clahey@helixcode.com> + * + * based on GtkPaned from Gtk+. Gtk+ Copyright notice follows. + */ + +/* GTK - The GIMP Toolkit + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* + * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS + * file for a list of people on the GTK+ Team. See the ChangeLog + * files for a list of changes. These files are distributed with + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + */ + +#ifndef __E_PANED_H__ +#define __E_PANED_H__ + +#include <gtk/gtkcontainer.h> + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + + +#define E_TYPE_PANED (e_paned_get_type ()) +#define E_PANED(obj) (GTK_CHECK_CAST ((obj), E_TYPE_PANED, EPaned)) +#define E_PANED_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_PANED, EPanedClass)) +#define E_IS_PANED(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_PANED)) +#define E_IS_PANED_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_PANED)) +#define E_PANED_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), E_TYPE_PANED, EPanedClass)) + + +typedef struct _EPaned EPaned; +typedef struct _EPanedClass EPanedClass; + +struct _EPaned +{ + GtkContainer container; + + GtkWidget *child1; + GtkWidget *child2; + + GdkWindow *handle; + GdkGC *xor_gc; + GdkCursorType cursor_type; + + /*< public >*/ + guint16 handle_size; + + /*< private >*/ + guint16 handle_width; + guint16 handle_height; + + gint child1_size; + gint last_allocation; + gint min_position; + gint max_position; + + guint position_set : 1; + guint in_drag : 1; + guint child1_shrink : 1; + guint child1_resize : 1; + guint child2_shrink : 1; + guint child2_resize : 1; + + gint16 handle_xpos; + gint16 handle_ypos; +}; + +struct _EPanedClass +{ + GtkContainerClass parent_class; +}; + + +GtkType e_paned_get_type (void); +void e_paned_add1 (EPaned *paned, + GtkWidget *child); +void e_paned_add2 (EPaned *paned, + GtkWidget *child); +void e_paned_pack1 (EPaned *paned, + GtkWidget *child, + gboolean resize, + gboolean shrink); +void e_paned_pack2 (EPaned *paned, + GtkWidget *child, + gboolean resize, + gboolean shrink); +gint e_paned_get_position (EPaned *paned); +void e_paned_set_position (EPaned *paned, + gint position); +void e_paned_set_handle_size (EPaned *paned, + guint16 size); + +/* Internal function */ +void e_paned_compute_position (EPaned *paned, + gint allocation, + gint child1_req, + gint child2_req); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __E_PANED_H__ */ diff --git a/widgets/e-paned/e-vpaned.c b/widgets/e-paned/e-vpaned.c new file mode 100644 index 0000000000..9a71b9acd9 --- /dev/null +++ b/widgets/e-paned/e-vpaned.c @@ -0,0 +1,403 @@ +/* EPaned - A slightly more advanced paned widget. + * Copyright (C) 2000 Helix Code, Inc. + * + * Author: Christopher James Lahey <clahey@helixcode.com> + * + * based on GtkPaned from Gtk+. Gtk+ Copyright notice follows. + */ + +/* GTK - The GIMP Toolkit + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* + * Modified by the GTK+ Team and others 1997-1999. See the AUTHORS + * file for a list of people on the GTK+ Team. See the ChangeLog + * files for a list of changes. These files are distributed with + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + */ + +#include "e-vpaned.h" + +static void e_vpaned_class_init (EVPanedClass *klass); +static void e_vpaned_init (EVPaned *vpaned); +static void e_vpaned_size_request (GtkWidget *widget, + GtkRequisition *requisition); +static void e_vpaned_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); +static void e_vpaned_draw (GtkWidget *widget, + GdkRectangle *area); +static void e_vpaned_xor_line (EPaned *paned); +static gboolean e_vpaned_button_press (GtkWidget *widget, + GdkEventButton *event); +static gboolean e_vpaned_button_release (GtkWidget *widget, + GdkEventButton *event); +static gboolean e_vpaned_motion (GtkWidget *widget, + GdkEventMotion *event); + +GtkType +e_vpaned_get_type (void) +{ + static GtkType vpaned_type = 0; + + if (!vpaned_type) + { + static const GtkTypeInfo vpaned_info = + { + "EVPaned", + sizeof (EVPaned), + sizeof (EVPanedClass), + (GtkClassInitFunc) e_vpaned_class_init, + (GtkObjectInitFunc) e_vpaned_init, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, + (GtkClassInitFunc) NULL, + }; + + vpaned_type = gtk_type_unique (E_TYPE_PANED, &vpaned_info); + } + + return vpaned_type; +} + +static void +e_vpaned_class_init (EVPanedClass *class) +{ + GtkWidgetClass *widget_class; + + widget_class = (GtkWidgetClass *) class; + + widget_class->size_request = e_vpaned_size_request; + widget_class->size_allocate = e_vpaned_size_allocate; + widget_class->draw = e_vpaned_draw; + widget_class->button_press_event = e_vpaned_button_press; + widget_class->button_release_event = e_vpaned_button_release; + widget_class->motion_notify_event = e_vpaned_motion; +} + +static void +e_vpaned_init (EVPaned *vpaned) +{ + EPaned *paned; + + g_return_if_fail (vpaned != NULL); + g_return_if_fail (E_IS_PANED (vpaned)); + + paned = E_PANED (vpaned); + + paned->cursor_type = GDK_SB_V_DOUBLE_ARROW; +} + +GtkWidget * +e_vpaned_new (void) +{ + EVPaned *vpaned; + + vpaned = gtk_type_new (E_TYPE_VPANED); + + return GTK_WIDGET (vpaned); +} + +static void +e_vpaned_size_request (GtkWidget *widget, + GtkRequisition *requisition) +{ + EPaned *paned; + GtkRequisition child_requisition; + + g_return_if_fail (widget != NULL); + g_return_if_fail (E_IS_VPANED (widget)); + g_return_if_fail (requisition != NULL); + + paned = E_PANED (widget); + requisition->width = 0; + requisition->height = 0; + + if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1)) + { + gtk_widget_size_request (paned->child1, &child_requisition); + + requisition->height = child_requisition.height; + requisition->width = child_requisition.width; + } + + if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2)) + { + gtk_widget_size_request (paned->child2, &child_requisition); + + requisition->width = MAX (requisition->width, child_requisition.width); + requisition->height += child_requisition.height; + } + + requisition->height += GTK_CONTAINER (paned)->border_width * 2 + paned->handle_size; + requisition->width += GTK_CONTAINER (paned)->border_width * 2; +} + +static void +e_vpaned_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + EPaned *paned; + GtkRequisition child1_requisition; + GtkRequisition child2_requisition; + GtkAllocation child1_allocation; + GtkAllocation child2_allocation; + gint border_width; + + g_return_if_fail (widget != NULL); + g_return_if_fail (E_IS_VPANED (widget)); + g_return_if_fail (allocation != NULL); + + widget->allocation = *allocation; + paned = E_PANED (widget); + border_width = GTK_CONTAINER (widget)->border_width; + + if (paned->child1) + gtk_widget_get_child_requisition (paned->child1, &child1_requisition); + else + child1_requisition.height = 0; + + if (paned->child2) + gtk_widget_get_child_requisition (paned->child2, &child2_requisition); + else + child2_requisition.height = 0; + + e_paned_compute_position (paned, + MAX (1, (gint) widget->allocation.height + - (gint) paned->handle_size + - 2 * border_width), + child1_requisition.height, + child2_requisition.height); + + /* Move the handle before the children so we don't get extra expose events */ + + paned->handle_xpos = border_width; + paned->handle_ypos = paned->child1_size + border_width; + paned->handle_width = MAX (1, (gint) widget->allocation.width - 2 * border_width); + paned->handle_height = paned->handle_size; + + if (GTK_WIDGET_REALIZED(widget)) + { + gdk_window_move_resize (widget->window, + allocation->x, allocation->y, + allocation->width, + allocation->height); + + gdk_window_move_resize (paned->handle, + paned->handle_xpos, + paned->handle_ypos, + paned->handle_width, + paned->handle_size); + } + + child1_allocation.width = child2_allocation.width = MAX (1, (gint) allocation->width - border_width * 2); + child1_allocation.height = paned->child1_size; + child1_allocation.x = child2_allocation.x = border_width; + child1_allocation.y = border_width; + + child2_allocation.y = child1_allocation.y + child1_allocation.height + paned->handle_height; + child2_allocation.height = MAX(1, (gint) allocation->height - child2_allocation.y - border_width); + + /* Now allocate the childen, making sure, when resizing not to + * overlap the windows */ + if (GTK_WIDGET_MAPPED (widget) && + paned->child1 && GTK_WIDGET_VISIBLE (paned->child1) && + paned->child1->allocation.height < child1_allocation.height) + { + if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2)) + gtk_widget_size_allocate(paned->child2, &child2_allocation); + gtk_widget_size_allocate(paned->child1, &child1_allocation); + } + else + { + if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1)) + gtk_widget_size_allocate(paned->child1, &child1_allocation); + if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2)) + gtk_widget_size_allocate(paned->child2, &child2_allocation); + } +} + +static void +e_vpaned_draw (GtkWidget *widget, + GdkRectangle *area) +{ + EPaned *paned; + GdkRectangle handle_area, child_area; + guint16 border_width; + + g_return_if_fail (widget != NULL); + g_return_if_fail (E_IS_PANED (widget)); + + if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget)) + { + paned = E_PANED (widget); + border_width = GTK_CONTAINER (paned)->border_width; + + gdk_window_clear_area (widget->window, + area->x, area->y, area->width, + area->height); + + handle_area.x = paned->handle_xpos; + handle_area.y = paned->handle_ypos; + handle_area.width = paned->handle_width; + handle_area.height = paned->handle_size; + + if (gdk_rectangle_intersect (&handle_area, area, &child_area)) + { + child_area.x -= paned->handle_xpos; + child_area.y -= paned->handle_ypos; + + gtk_paint_handle (widget->style, + paned->handle, + GTK_STATE_NORMAL, + GTK_SHADOW_NONE, + &child_area, + widget, + "paned", + 0, 0, -1, -1, + GTK_ORIENTATION_HORIZONTAL); + + } + /* Redraw the children + */ + if (paned->child1 && gtk_widget_intersect (paned->child1, area, &child_area)) + gtk_widget_draw (paned->child1, &child_area); + if (paned->child2 && gtk_widget_intersect (paned->child2, area, &child_area)) + gtk_widget_draw (paned->child2, &child_area); + } +} + +static void +e_vpaned_xor_line (EPaned *paned) +{ + GtkWidget *widget; + GdkGCValues values; + guint16 ypos; + + widget = GTK_WIDGET (paned); + + if (!paned->xor_gc) + { + values.function = GDK_INVERT; + values.subwindow_mode = GDK_INCLUDE_INFERIORS; + paned->xor_gc = gdk_gc_new_with_values (widget->window, + &values, + GDK_GC_FUNCTION | GDK_GC_SUBWINDOW); + } + + gdk_gc_set_line_attributes (paned->xor_gc, 2, GDK_LINE_SOLID, + GDK_CAP_NOT_LAST, GDK_JOIN_BEVEL); + + ypos = paned->child1_size + + GTK_CONTAINER (paned)->border_width + paned->handle_size / 2; + + gdk_draw_line (widget->window, paned->xor_gc, + 0, + ypos, + widget->allocation.width - 1, + ypos); +} + +static gboolean +e_vpaned_button_press (GtkWidget *widget, + GdkEventButton *event) +{ + EPaned *paned; + + g_return_val_if_fail (widget != NULL, FALSE); + g_return_val_if_fail (E_IS_PANED (widget), FALSE); + + paned = E_PANED (widget); + + if (!paned->in_drag && + (event->window == paned->handle) && (event->button == 1)) + { + paned->in_drag = TRUE; + /* We need a server grab here, not gtk_grab_add(), since + * we don't want to pass events on to the widget's children */ + gdk_pointer_grab (paned->handle, FALSE, + GDK_POINTER_MOTION_HINT_MASK + | GDK_BUTTON1_MOTION_MASK + | GDK_BUTTON_RELEASE_MASK, NULL, NULL, + event->time); + paned->child1_size += event->y - paned->handle_size / 2; + paned->child1_size = CLAMP (paned->child1_size, 0, + widget->allocation.height - + paned->handle_size - + 2 * GTK_CONTAINER (paned)->border_width); + e_vpaned_xor_line(paned); + + return TRUE; + } + + return FALSE; +} + +static gboolean +e_vpaned_button_release (GtkWidget *widget, + GdkEventButton *event) +{ + EPaned *paned; + + g_return_val_if_fail (widget != NULL, FALSE); + g_return_val_if_fail (E_IS_PANED (widget), FALSE); + + paned = E_PANED (widget); + + if (paned->in_drag && (event->button == 1)) + { + e_vpaned_xor_line (paned); + paned->in_drag = FALSE; + paned->position_set = TRUE; + gdk_pointer_ungrab (event->time); + gtk_widget_queue_resize (GTK_WIDGET (paned)); + + return TRUE; + } + + return FALSE; +} + +static gboolean +e_vpaned_motion (GtkWidget *widget, + GdkEventMotion *event) +{ + EPaned *paned; + gint y; + + g_return_val_if_fail (widget != NULL, FALSE); + g_return_val_if_fail (E_IS_PANED (widget), FALSE); + + if (event->is_hint || event->window != widget->window) + gtk_widget_get_pointer (widget, NULL, &y); + else + y = event->y; + + paned = E_PANED (widget); + + if (paned->in_drag) + { + gint size = y - GTK_CONTAINER(paned)->border_width - paned->handle_size / 2; + + e_vpaned_xor_line (paned); + paned->child1_size = CLAMP (size, paned->min_position, paned->max_position); + e_vpaned_xor_line(paned); + } + + return TRUE; +} diff --git a/widgets/e-paned/e-vpaned.h b/widgets/e-paned/e-vpaned.h new file mode 100644 index 0000000000..1c247472fd --- /dev/null +++ b/widgets/e-paned/e-vpaned.h @@ -0,0 +1,72 @@ +/* EPaned - A slightly more advanced paned widget. + * Copyright (C) 2000 Helix Code, Inc. + * + * Author: Christopher James Lahey <clahey@helixcode.com> + * + * based on GtkPaned from Gtk+. Gtk+ Copyright notice follows. + */ + +/* GTK - The GIMP Toolkit + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* + * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS + * file for a list of people on the GTK+ Team. See the ChangeLog + * files for a list of changes. These files are distributed with + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + */ + +#ifndef __E_VPANED_H__ +#define __E_VPANED_H__ + +#include <widgets/e-paned/e-paned.h> + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#define E_TYPE_VPANED (e_vpaned_get_type ()) +#define E_VPANED(obj) (GTK_CHECK_CAST ((obj), E_TYPE_VPANED, EVPaned)) +#define E_VPANED_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_VPANED, EVPanedClass)) +#define E_IS_VPANED(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_VPANED)) +#define E_IS_VPANED_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_VPANED)) +#define E_VPANED_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), E_TYPE_VPANED, EVPanedClass)) + + +typedef struct _EVPaned EVPaned; +typedef struct _EVPanedClass EVPanedClass; + +struct _EVPaned +{ + EPaned paned; +}; + +struct _EVPanedClass +{ + EPanedClass parent_class; +}; + +GtkType e_vpaned_get_type (void); +GtkWidget *e_vpaned_new (void); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __E_VPANED_H__ */ diff --git a/widgets/shortcut-bar/ChangeLog b/widgets/shortcut-bar/ChangeLog index c49b12ca72..921de9a2ce 100644 --- a/widgets/shortcut-bar/ChangeLog +++ b/widgets/shortcut-bar/ChangeLog @@ -1,3 +1,9 @@ +2000-05-24 Christopher James Lahey <clahey@helixcode.com> + + * Makefile.am: Added libepaned.a. + + * test-shortcut-bar.c: Switched from GtkPaned to EPaned. + 2000-05-18 Damon Chaplin <damon@helixcode.com> * e-shortcut-bar.[hc]: new signals "added_item", "removed_item", diff --git a/widgets/shortcut-bar/Makefile.am b/widgets/shortcut-bar/Makefile.am index 2d7189d901..6cd59470b0 100644 --- a/widgets/shortcut-bar/Makefile.am +++ b/widgets/shortcut-bar/Makefile.am @@ -25,6 +25,7 @@ test_shortcut_bar_SOURCES = \ test_shortcut_bar_LDADD = \ ./libshortcut-bar.a \ + $(top_builddir)/widgets/e-paned/libepaned.a \ ../e-text/libetext.a \ ../misc/libemiscwidgets.a \ ../../e-util/libeutil.la \ diff --git a/widgets/shortcut-bar/test-shortcut-bar.c b/widgets/shortcut-bar/test-shortcut-bar.c index 5d9ae700f3..3d3503c745 100644 --- a/widgets/shortcut-bar/test-shortcut-bar.c +++ b/widgets/shortcut-bar/test-shortcut-bar.c @@ -30,6 +30,8 @@ #include "e-shortcut-bar.h" +#include <widgets/e-paned/e-hpaned.h> + #define NUM_SHORTCUT_TYPES 5 gchar *shortcut_types[NUM_SHORTCUT_TYPES] = { "folder:", "file:", "calendar:", "todo:", "contacts:" @@ -114,12 +116,12 @@ main (int argc, char *argv[]) gtk_signal_connect (GTK_OBJECT (window), "delete-event", GTK_SIGNAL_FUNC (quit), NULL); - hpaned = gtk_hpaned_new (); + hpaned = e_hpaned_new (); gnome_app_set_contents (GNOME_APP (window), hpaned); gtk_widget_show (hpaned); shortcut_bar = e_shortcut_bar_new (); - gtk_paned_pack1 (GTK_PANED (hpaned), shortcut_bar, FALSE, TRUE); + e_paned_pack1 (E_PANED (hpaned), shortcut_bar, FALSE, TRUE); gtk_widget_show (shortcut_bar); e_shortcut_bar_set_icon_callback (E_SHORTCUT_BAR (shortcut_bar), icon_callback, @@ -138,11 +140,11 @@ main (int argc, char *argv[]) gtk_container_set_border_width (GTK_CONTAINER (shortcut_bar), 4); #endif - gtk_paned_set_position (GTK_PANED (hpaned), 100); - /*gtk_paned_set_gutter_size (GTK_PANED (hpaned), 12);*/ + e_paned_set_position (E_PANED (hpaned), 100); + /*e_paned_set_gutter_size (E_PANED (hpaned), 12);*/ vbox = gtk_vbox_new (FALSE, 0); - gtk_paned_pack2 (GTK_PANED (hpaned), vbox, TRUE, TRUE); + e_paned_pack2 (E_PANED (hpaned), vbox, TRUE, TRUE); gtk_widget_show (vbox); |