[Monodevelop-patches-list] r1076 - trunk/MonoDevelop/gdldock/sources/gdl
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Mon Mar 1 20:23:33 EST 2004
Author: ggiraldez
Date: 2004-03-01 20:23:32 -0500 (Mon, 01 Mar 2004)
New Revision: 1076
Modified:
trunk/MonoDevelop/gdldock/sources/gdl/Makefile.am
trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-item.c
trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-layout.c
trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-master.c
trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-notebook.c
trunk/MonoDevelop/gdldock/sources/gdl/gdl-stock.c
Log:
- Define GDL_GLADEDIR and GDL_IMAGESDIR in Makefile.am to minimize differences
with the gdl module
- When traversing the widget hierarchy looking for a dock target, ignore those
docks belonging to a different master
- Sync with gdl module, get the patch from 2004-02-12 which uses thickness to
draw a border around the dock item and sets the default thickness for dock
items inside notebooks to 2.
Modified: trunk/MonoDevelop/gdldock/sources/gdl/Makefile.am
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/Makefile.am 2004-03-02 00:20:02 UTC (rev 1075)
+++ trunk/MonoDevelop/gdldock/sources/gdl/Makefile.am 2004-03-02 01:23:32 UTC (rev 1076)
@@ -11,7 +11,9 @@
GDL_DEPENDENCIES_LIBS = $(shell pkg-config --libs $(GDL_REQUIREMENTS))
INCLUDES = \
- -DG_LOG_DOMAIN=\"GdlDock\" -I.. -I. \
+ -DG_LOG_DOMAIN=\"GdlDock\" -I.. -I. \
+ -DGDL_GLADEDIR=\".\" \
+ -DGDL_IMAGESDIR=\".\" \
$(GDL_DEPENDENCIES_CFLAGS)
libgdldock_headers = \
Modified: trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-item.c
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-item.c 2004-03-02 00:20:02 UTC (rev 1075)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-item.c 2004-03-02 01:23:32 UTC (rev 1076)
@@ -193,6 +193,8 @@
static void
gdl_dock_item_class_init (GdlDockItemClass *klass)
{
+ static gboolean style_initialized = FALSE;
+
GObjectClass *g_object_class;
GtkObjectClass *gtk_object_class;
GtkWidgetClass *widget_class;
@@ -334,6 +336,18 @@
klass->dock_drag_motion = NULL;
klass->dock_drag_end = NULL;
klass->set_orientation = gdl_dock_item_real_set_orientation;
+
+ if (!style_initialized)
+ {
+ style_initialized = TRUE;
+ gtk_rc_parse_string (
+ "style \"gdl-dock-item-default\" {\n"
+ "xthickness = 0\n"
+ "ythickness = 0\n"
+ "}\n"
+ "class \"GdlDockItem\" "
+ "style : gtk \"gdl-dock-item-default\"\n");
+ }
}
static void
@@ -657,8 +671,8 @@
requisition->width = 0;
}
- requisition->width += GTK_CONTAINER (widget)->border_width * 2;
- requisition->height += GTK_CONTAINER (widget)->border_width * 2;
+ requisition->width += (GTK_CONTAINER (widget)->border_width + widget->style->xthickness) * 2;
+ requisition->height += (GTK_CONTAINER (widget)->border_width + widget->style->ythickness) * 2;
widget->requisition = *requisition;
}
@@ -689,19 +703,19 @@
border_width = GTK_CONTAINER (widget)->border_width;
- child_allocation.x = border_width;
- child_allocation.y = border_width;
- child_allocation.width = allocation->width - 2 * border_width;
- child_allocation.height = allocation->height - 2 * border_width;
+ child_allocation.x = border_width + widget->style->xthickness;
+ child_allocation.y = border_width + widget->style->ythickness;
+ child_allocation.width = allocation->width
+ - 2 * (border_width + widget->style->xthickness);
+ child_allocation.height = allocation->height
+ - 2 * (border_width + widget->style->ythickness);
if (GDL_DOCK_ITEM_GRIP_SHOWN (item)) {
- GtkAllocation grip_alloc = *allocation;
+ GtkAllocation grip_alloc = child_allocation;
GtkRequisition grip_req;
gtk_widget_size_request (item->_priv->grip, &grip_req);
- grip_alloc.x = grip_alloc.y = 0;
-
if (item->orientation == GTK_ORIENTATION_HORIZONTAL) {
child_allocation.x += grip_req.width;
child_allocation.width -= grip_req.width;
@@ -813,7 +827,6 @@
g_return_if_fail (widget != NULL);
g_return_if_fail (GDL_IS_DOCK_ITEM (widget));
- /* FIXME: maybe remove this method altogether and use the default implementation */
if (GTK_WIDGET_REALIZED (widget) && !GTK_WIDGET_NO_WINDOW (widget)) {
gtk_style_set_background (widget->style, widget->window,
widget->state);
Modified: trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-layout.c
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-layout.c 2004-03-02 00:20:02 UTC (rev 1075)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-layout.c 2004-03-02 01:23:32 UTC (rev 1076)
@@ -35,7 +35,6 @@
#include "gdl-tools.h"
#include "gdl-dock-placeholder.h"
-#define GDL_GLADEDIR "."
/* ----- Private variables ----- */
Modified: trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-master.c
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-master.c 2004-03-02 00:20:02 UTC (rev 1075)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-master.c 2004-03-02 01:23:32 UTC (rev 1076)
@@ -463,7 +463,8 @@
get to a GdlDock by walking up the hierarchy */
gdk_window_get_user_data (window, (gpointer) &widget);
if (GTK_IS_WIDGET (widget)) {
- while (widget && !GDL_IS_DOCK (widget))
+ while (widget && (!GDL_IS_DOCK (widget) ||
+ GDL_DOCK_OBJECT_GET_MASTER (widget) != master))
widget = widget->parent;
if (widget) {
gint win_w, win_h;
Modified: trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-notebook.c
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-notebook.c 2004-03-02 00:20:02 UTC (rev 1075)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-notebook.c 2004-03-02 01:23:32 UTC (rev 1076)
@@ -96,6 +96,8 @@
static void
gdl_dock_notebook_class_init (GdlDockNotebookClass *klass)
{
+ static gboolean style_initialized = FALSE;
+
GObjectClass *g_object_class;
GtkObjectClass *gtk_object_class;
GtkWidgetClass *widget_class;
@@ -136,6 +138,18 @@
0,
G_PARAM_READWRITE |
GDL_DOCK_PARAM_EXPORT | GDL_DOCK_PARAM_AFTER));
+
+ if (!style_initialized) {
+ style_initialized = TRUE;
+
+ gtk_rc_parse_string (
+ "style \"gdl-dock-notebook-default\" {\n"
+ "xthickness = 2\n"
+ "ythickness = 2\n"
+ "}\n"
+ "widget_class \"*.GtkNotebook.GdlDockItem\" "
+ "style : gtk \"gdl-dock-notebook-default\"\n");
+ }
}
static void
@@ -254,7 +268,7 @@
{
GdlDockNotebook *notebook;
GtkWidget *tablabel;
-
+
notebook = GDL_DOCK_NOTEBOOK (data);
/* deactivate old tablabel */
Modified: trunk/MonoDevelop/gdldock/sources/gdl/gdl-stock.c
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-stock.c 2004-03-02 00:20:02 UTC (rev 1075)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-stock.c 2004-03-02 01:23:32 UTC (rev 1076)
@@ -26,8 +26,6 @@
#include <gtk/gtkiconfactory.h>
#include "gdl-stock.h"
-#define GDL_IMAGESDIR "."
-
static GtkIconFactory *gdl_stock_factory = NULL;
static struct {
More information about the Monodevelop-patches-list
mailing list