ghex r1204 - in branches/gnome-2-22: . src
- From: jjongsma svn gnome org
- To: svn-commits-list gnome org
- Subject: ghex r1204 - in branches/gnome-2-22: . src
- Date: Sun, 13 Apr 2008 18:22:28 +0100 (BST)
Author: jjongsma
Date: Sun Apr 13 18:22:28 2008
New Revision: 1204
URL: http://svn.gnome.org/viewvc/ghex?rev=1204&view=rev
Log:
Merged 3 patches from trunk with the following command:
svn merge -r 1200:1203 svn.gnome.org/svn/ghex/trunk
Modified:
branches/gnome-2-22/ChangeLog
branches/gnome-2-22/src/Makefile.am
branches/gnome-2-22/src/gtkhex.c
Modified: branches/gnome-2-22/src/Makefile.am
==============================================================================
--- branches/gnome-2-22/src/Makefile.am (original)
+++ branches/gnome-2-22/src/Makefile.am Sun Apr 13 18:22:28 2008
@@ -35,6 +35,8 @@
$(LIBGTKHEX_LIBS) \
$(GAILUTIL_LIBS)
+libgtkhex_la_CFLAGS = -DG_LOG_DOMAIN=\"libgtkhex\"
+
libgtkhex_HEADERS = \
hex-document.h \
gtkhex.h
Modified: branches/gnome-2-22/src/gtkhex.c
==============================================================================
--- branches/gnome-2-22/src/gtkhex.c (original)
+++ branches/gnome-2-22/src/gtkhex.c Sun Apr 13 18:22:28 2008
@@ -730,16 +730,14 @@
GtkHex *gh = GTK_HEX(widget);
gint border = GTK_CONTAINER(widget)->border_width;
gint x;
-
- gdk_window_clear_area (widget->window, area->x, area->y,
- area->width, area->height);
x = border;
if(gh->show_offsets) {
gtk_paint_shadow(widget->style, widget->window,
GTK_STATE_NORMAL, GTK_SHADOW_IN,
NULL, widget, NULL,
- border, border, 8*gh->char_width + 2*widget_get_xt(widget),
+ widget->allocation.x + border, widget->allocation.y + border,
+ 8*gh->char_width + 2*widget_get_xt(widget),
widget->allocation.height - 2*border);
x += 8*gh->char_width + 2*widget_get_xt(widget);
}
@@ -747,13 +745,15 @@
gtk_paint_shadow(widget->style, widget->window,
GTK_STATE_NORMAL, GTK_SHADOW_IN,
NULL, widget, NULL,
- x, border, gh->xdisp_width + 2*widget_get_xt(widget),
+ widget->allocation.x + x, widget->allocation.y + border,
+ gh->xdisp_width + 2*widget_get_xt(widget),
widget->allocation.height - 2*border);
gtk_paint_shadow(widget->style, widget->window,
GTK_STATE_NORMAL, GTK_SHADOW_IN,
NULL, widget, NULL,
- widget->allocation.width - border - gh->adisp_width - gh->scrollbar->requisition.width - 2*widget_get_xt(widget), border,
+ widget->allocation.x + widget->allocation.width - border - gh->adisp_width - gh->scrollbar->requisition.width - 2*widget_get_xt(widget),
+ widget->allocation.y + border,
gh->adisp_width + 2*widget_get_xt(widget),
widget->allocation.height - 2*border);
}
@@ -1821,8 +1821,8 @@
xt = widget_get_xt(w);
yt = widget_get_yt(w);
- my_alloc.x = border_width + xt;
- my_alloc.y = border_width + yt;
+ my_alloc.x = alloc->x + border_width + xt;
+ my_alloc.y = alloc->y + border_width + yt;
my_alloc.height = MAX(alloc->height - 2*border_width - 2*yt, 1);
if(gh->show_offsets) {
my_alloc.width = 8*gh->char_width;
@@ -1832,13 +1832,13 @@
}
my_alloc.width = gh->xdisp_width;
gtk_widget_size_allocate(gh->xdisp, &my_alloc);
- my_alloc.x = alloc->width - border_width - gh->scrollbar->requisition.width;
- my_alloc.y = border_width;
+ my_alloc.x = alloc->x + alloc->width - border_width - gh->scrollbar->requisition.width;
+ my_alloc.y = alloc->y + border_width;
my_alloc.width = gh->scrollbar->requisition.width;
my_alloc.height = MAX(alloc->height - 2*border_width, 1);
gtk_widget_size_allocate(gh->scrollbar, &my_alloc);
my_alloc.x -= gh->adisp_width + xt;
- my_alloc.y = border_width + yt;
+ my_alloc.y = alloc->y + border_width + yt;
my_alloc.width = gh->adisp_width;
my_alloc.height = MAX(alloc->height - 2*border_width - 2*yt, 1);
gtk_widget_size_allocate(gh->adisp, &my_alloc);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]