summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java100
1 files changed, 70 insertions, 30 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
index a5ad2e6531..9b2296d0e7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
@@ -13,6 +13,7 @@ package org.eclipse.swt.widgets;
import org.eclipse.swt.*;
import org.eclipse.swt.internal.*;
+import org.eclipse.swt.internal.cairo.*;
import org.eclipse.swt.internal.gtk.*;
import org.eclipse.swt.graphics.*;
import org.eclipse.swt.events.*;
@@ -1914,39 +1915,52 @@ long /*int*/ gtk_expand_collapse_cursor_row (long /*int*/ widget, long /*int*/ l
return 0;
}
-long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) {
- if ((state & OBSCURED) != 0) return 0;
+void drawInheritedBackground (long /*int*/ eventPtr, long /*int*/ cairo) {
if ((state & PARENT_BACKGROUND) != 0 || backgroundImage != null) {
Control control = findBackgroundControl ();
if (control != null) {
- GdkEventExpose gdkEvent = new GdkEventExpose ();
- OS.memmove (gdkEvent, eventPtr, GdkEventExpose.sizeof);
long /*int*/ window = OS.gtk_tree_view_get_bin_window (handle);
- if (window == gdkEvent.window) {
- int [] width = new int [1], height = new int [1];
- gdk_window_get_size (window, width, height);
- long /*int*/ parent = 0;
- int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, parent);
- GdkRectangle rect = new GdkRectangle ();
- boolean expanded = true;
- while (itemCount != 0 && expanded && height [0] > (rect.y + rect.height)) {
- long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
- OS.gtk_tree_model_iter_nth_child (modelHandle, iter, parent, itemCount - 1);
- itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, iter);
- long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
- OS.gtk_tree_view_get_cell_area (handle, path, 0, rect);
- expanded = OS.gtk_tree_view_row_expanded (handle, path);
- OS.gtk_tree_path_free (path);
- if (parent != 0) OS.g_free (parent);
- parent = iter;
- }
+ long /*int*/ rgn = 0;
+ if (eventPtr != 0) {
+ GdkEventExpose gdkEvent = new GdkEventExpose ();
+ OS.memmove (gdkEvent, eventPtr, GdkEventExpose.sizeof);
+ if (window != gdkEvent.window) return;
+ rgn = gdkEvent.region;
+ }
+ int [] width = new int [1], height = new int [1];
+ gdk_window_get_size (window, width, height);
+ long /*int*/ parent = 0;
+ int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, parent);
+ GdkRectangle rect = new GdkRectangle ();
+ boolean expanded = true;
+ while (itemCount != 0 && expanded && height [0] > (rect.y + rect.height)) {
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ OS.gtk_tree_model_iter_nth_child (modelHandle, iter, parent, itemCount - 1);
+ itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, iter);
+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
+ OS.gtk_tree_view_get_cell_area (handle, path, 0, rect);
+ expanded = OS.gtk_tree_view_row_expanded (handle, path);
+ OS.gtk_tree_path_free (path);
if (parent != 0) OS.g_free (parent);
- if (height [0] > (rect.y + rect.height)) {
- drawBackground (control, window, gdkEvent.region, 0, rect.y + rect.height, width [0], height [0] - (rect.y + rect.height));
- }
+ parent = iter;
+ }
+ if (parent != 0) OS.g_free (parent);
+ if (height [0] > (rect.y + rect.height)) {
+ drawBackground (control, window, cairo, rgn, 0, rect.y + rect.height, width [0], height [0] - (rect.y + rect.height));
}
}
}
+}
+
+long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) {
+ if ((state & OBSCURED) != 0) return 0;
+ drawInheritedBackground (0, cairo);
+ return super.gtk_draw (widget, cairo);
+}
+
+long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) {
+ if ((state & OBSCURED) != 0) return 0;
+ drawInheritedBackground (eventPtr, 0);
return super.gtk_expose_event (widget, eventPtr);
}
@@ -2534,7 +2548,17 @@ long /*int*/ rendererGetSizeProc (long /*int*/ cell, long /*int*/ widget, long /
return 0;
}
+long /*int*/ rendererRenderProc (long /*int*/ cell, long /*int*/ cr, long /*int*/ widget, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ flags) {
+ rendererRender (cell, cr, 0, widget, background_area, cell_area, 0, flags);
+ return 0;
+}
+
long /*int*/ rendererRenderProc (long /*int*/ cell, long /*int*/ window, long /*int*/ widget, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ expose_area, long /*int*/ flags) {
+ rendererRender (cell, 0, window, widget, background_area, cell_area, expose_area, flags);
+ return 0;
+}
+
+void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, long /*int*/ widget, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ expose_area, long /*int*/ flags) {
TreeItem item = null;
long /*int*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);
if (iter != 0) item = _getItem (iter);
@@ -2574,7 +2598,14 @@ long /*int*/ rendererRenderProc (long /*int*/ cell, long /*int*/ window, long /*
if ((state & PARENT_BACKGROUND) != 0 || backgroundImage != null) {
Control control = findBackgroundControl ();
if (control != null) {
- drawBackground (control, window, 0, rect.x, rect.y, rect.width, rect.height);
+ if (cr != 0) {
+ Cairo.cairo_save (cr);
+ Cairo.cairo_reset_clip (cr);
+ }
+ drawBackground (control, window, cr, 0, rect.x, rect.y, rect.width, rect.height);
+ if (cr != 0) {
+ Cairo.cairo_restore (cr);
+ }
}
}
}
@@ -2588,7 +2619,14 @@ long /*int*/ rendererRenderProc (long /*int*/ cell, long /*int*/ window, long /*
if (wasSelected) {
Control control = findBackgroundControl ();
if (control == null) control = this;
- drawBackground (control, window, 0, rect.x, rect.y, rect.width, rect.height);
+ if (cr != 0) {
+ Cairo.cairo_save (cr);
+ Cairo.cairo_reset_clip (cr);
+ }
+ drawBackground (control, window, cr, 0, rect.x, rect.y, rect.width, rect.height);
+ if (cr != 0) {
+ Cairo.cairo_restore (cr);
+ }
}
GC gc = new GC (this);
if ((drawState & SWT.SELECTED) != 0) {
@@ -2632,7 +2670,6 @@ long /*int*/ rendererRenderProc (long /*int*/ cell, long /*int*/ window, long /*
}
}
}
- long /*int*/ result = 0;
if ((drawState & SWT.BACKGROUND) != 0 && (drawState & SWT.SELECTED) == 0) {
GC gc = new GC (this);
gc.setBackground (item.getBackground (columnIndex));
@@ -2648,7 +2685,11 @@ long /*int*/ rendererRenderProc (long /*int*/ cell, long /*int*/ window, long /*
if (drawForeground != null && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
OS.g_object_set (cell, OS.foreground_gdk, drawForeground, 0);
}
- result = OS.call (klass.render, cell, window, handle, background_area, cell_area, expose_area, drawFlags);
+ if (OS.GTK_VERSION >= OS.VERSION (3, 0, 0)) {
+ OS.call (klass.render, cell, cr, widget, background_area, cell_area, drawFlags);
+ } else {
+ OS.call (klass.render, cell, window, widget, background_area, cell_area, expose_area, drawFlags);
+ }
}
if (item != null) {
if (OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
@@ -2723,7 +2764,6 @@ long /*int*/ rendererRenderProc (long /*int*/ cell, long /*int*/ window, long /*
}
}
}
- return result;
}
void resetCustomDraw () {
generated by cgit (git 2.34.1) at 2024-06-30 15:52:40 +0000