diff options
author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-10-31 22:50:53 +0900 |
---|---|---|
committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-10-31 22:50:53 +0900 |
commit | 9c4eb3d4314dbcd18d0f1a36ccb873070a4f5db8 (patch) | |
tree | 5c78110bb829958f546829130074b27dffc032b6 /gtk/gtkcellarea.h | |
parent | 163c3c8852dd93dfe42454ee10adef9cdcfa5e44 (diff) | |
download | gtk+-9c4eb3d4314dbcd18d0f1a36ccb873070a4f5db8.tar.gz |
Changed GtkCellArea margin-left/right... for cell-margin-left/right...
The rationale here is that every cell in an area needs to have space
reserved around it, requests have to be fully margin inclusive...
cells need to have the full size fed as the "background area" and
the "cell area" has margins removed... This will be used by GtkTreeViewColumn
to set the focus line width so that cells can paint a background on the
full background, then render themselves into the cell area... and parents
can go ahead and draw focus and other indicators on the background area
but outside of the cell area.
Diffstat (limited to 'gtk/gtkcellarea.h')
-rw-r--r-- | gtk/gtkcellarea.h | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/gtk/gtkcellarea.h b/gtk/gtkcellarea.h index a6f06ec4ad..1046469bd7 100644 --- a/gtk/gtkcellarea.h +++ b/gtk/gtkcellarea.h @@ -239,23 +239,34 @@ void gtk_cell_area_cell_get_property (GtkCellArea G_OBJECT_WARN_INVALID_PSPEC ((object), "cell property id", (property_id), (pspec)) /* Margins */ -gint gtk_cell_area_get_margin_left (GtkCellArea *area); -void gtk_cell_area_set_margin_left (GtkCellArea *area, +gint gtk_cell_area_get_cell_margin_left (GtkCellArea *area); +void gtk_cell_area_set_cell_margin_left (GtkCellArea *area, gint margin); -gint gtk_cell_area_get_margin_right (GtkCellArea *area); -void gtk_cell_area_set_margin_right (GtkCellArea *area, +gint gtk_cell_area_get_cell_margin_right (GtkCellArea *area); +void gtk_cell_area_set_cell_margin_right (GtkCellArea *area, gint margin); -gint gtk_cell_area_get_margin_top (GtkCellArea *area); -void gtk_cell_area_set_margin_top (GtkCellArea *area, +gint gtk_cell_area_get_cell_margin_top (GtkCellArea *area); +void gtk_cell_area_set_cell_margin_top (GtkCellArea *area, gint margin); -gint gtk_cell_area_get_margin_bottom (GtkCellArea *area); -void gtk_cell_area_set_margin_bottom (GtkCellArea *area, +gint gtk_cell_area_get_cell_margin_bottom (GtkCellArea *area); +void gtk_cell_area_set_cell_margin_bottom (GtkCellArea *area, gint margin); -/* For convenience in area implementations */ -void gtk_cell_area_inner_area (GtkCellArea *area, - GdkRectangle *background_area, - GdkRectangle *cell_area); +/* Functions for area implementations */ + +/* Distinguish the inner cell area from the whole requested area including margins */ +void gtk_cell_area_inner_cell_area (GtkCellArea *area, + GdkRectangle *cell_area, + GdkRectangle *inner_cell_area); + +/* Request the size of a cell while respecting the cell margins (requests are margin inclusive) */ +void gtk_cell_area_request_renderer (GtkCellArea *area, + GtkCellRenderer *renderer, + GtkOrientation orientation, + GtkWidget *widget, + gint for_size, + gint *minimum_size, + gint *natural_size); G_END_DECLS |