AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity
d3c204c774
gtk2/gtk/gtksizerequest.c

889 lines
32 KiB
C
Raw Normal View History

Mass api change from GtkExtendedLayout --> GtkSizeRequest This commit makes a few massive changes to the extended layout code: a.) gtkextendedlayout.c --> gtksizerequest.c b.) _is_height_for_width --> get_request_mode() c.) get_desired_size(), get_desired_width(), get_desired_height() --> get_size(), get_width(), get_height() This is the first partial commit and only effects portions of the tree that have already been merged in master (in order to easily cherry pick this commit). Conflicts: gtk/Makefile.am gtk/gtk.h gtk/gtk.symbols gtk/gtkextendedlayout.h
2010-06-18 04:11:26 +00:00
/* gtksizerequest.c
Slightly reduced extended layout cache size, updated authors/copywrite year.
2010-04-20 22:53:54 +00:00
* Copyright (C) 2007-2010 Openismus GmbH
native-layout: Introduce GtkExtendedLayout interface.
2009-12-02 08:48:42 +00:00
*
Slightly reduced extended layout cache size, updated authors/copywrite year.
2010-04-20 22:53:54 +00:00
* Authors:
native-layout: Introduce GtkExtendedLayout interface.
2009-12-02 08:48:42 +00:00
* Mathias Hasselmann <mathias@openismus.com>
Slightly reduced extended layout cache size, updated authors/copywrite year.
2010-04-20 22:53:54 +00:00
* Tristan Van Berkom <tristan.van.berkom@gmail.com>
native-layout: Introduce GtkExtendedLayout interface.
2009-12-02 08:48:42 +00:00
*
* 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
Change FSF Address
2012-02-27 13:01:10 +00:00
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
native-layout: Introduce GtkExtendedLayout interface.
2009-12-02 08:48:42 +00:00
*/
#include <config.h>
Split off gtkprivate.h The gtkprivate.h header contains GtkWidget-specific private symbols that are not useful except in a handful of cases. Basically everything includes gtkprivate.h for the GTK_PARAM_* macros. https://bugzilla.gnome.org/show_bug.cgi?id=632539
2010-10-19 17:14:46 +00:00
Mass api change from GtkExtendedLayout --> GtkSizeRequest This commit makes a few massive changes to the extended layout code: a.) gtkextendedlayout.c --> gtksizerequest.c b.) _is_height_for_width --> get_request_mode() c.) get_desired_size(), get_desired_width(), get_desired_height() --> get_size(), get_width(), get_height() This is the first partial commit and only effects portions of the tree that have already been merged in master (in order to easily cherry pick this commit). Conflicts: gtk/Makefile.am gtk/gtk.h gtk/gtk.symbols gtk/gtkextendedlayout.h
2010-06-18 04:11:26 +00:00
#include "gtksizerequest.h"
Split off gtkprivate.h The gtkprivate.h header contains GtkWidget-specific private symbols that are not useful except in a handful of cases. Basically everything includes gtkprivate.h for the GTK_PARAM_* macros. https://bugzilla.gnome.org/show_bug.cgi?id=632539
2010-10-19 17:14:46 +00:00
Remove GtkObject completely
2010-09-18 23:57:32 +00:00
#include "gtkdebug.h"
native-layout: Introduce GtkExtendedLayout interface.
2009-12-02 08:48:42 +00:00
#include "gtkintl.h"
Split off gtkprivate.h The gtkprivate.h header contains GtkWidget-specific private symbols that are not useful except in a handful of cases. Basically everything includes gtkprivate.h for the GTK_PARAM_* macros. https://bugzilla.gnome.org/show_bug.cgi?id=632539
2010-10-19 17:14:46 +00:00
#include "gtkprivate.h"
#include "gtksizegroup-private.h"
sizerequest: Split out size request cache code into separate header
2012-11-13 12:41:05 +00:00
#include "gtksizerequestcacheprivate.h"
Split off gtkprivate.h The gtkprivate.h header contains GtkWidget-specific private symbols that are not useful except in a handful of cases. Basically everything includes gtkprivate.h for the GTK_PARAM_* macros. https://bugzilla.gnome.org/show_bug.cgi?id=632539
2010-10-19 17:14:46 +00:00
#include "gtkwidgetprivate.h"
Move deprecated gtkwidget style api to gtkstyle
2011-11-02 10:45:10 +00:00
#include "deprecated/gtkstyle.h"
native-layout: Introduce GtkExtendedLayout interface.
2009-12-02 08:48:42 +00:00
Reduce memory consumption of the size request cache. This patch makes contextual height-for-width request caching optional (the contextual cache is not allocated for widgets that report GTK_SIZE_REQUEST_CONSTANT_SIZE).
2011-03-05 10:29:10 +00:00
size request: Redo the recursion checks Use G_ENABLE_CONSISTENCY checks for the recursion checks in gtksizerequest.c
2015-09-09 01:06:38 +00:00
#ifdef G_ENABLE_CONSISTENCY_CHECKS
Cache heights-for-range-of-widths instead of height for every width. This patch optimizes window resizes by assuming that if a widget has the same height at a width of 50 as with a width of 150, the height for width 100 will also be the same. The patch also further optimizes the cache allocator, now there are 2 pointer arrays of up to a maximum of 5 requests, the arrays will only be allocated if a request is ever made in that orientation and the array will be sparse until each request is made (i.e. if a label can only wrap to 3 lines, there will only be 3 out of a possible 5 SizeRequest structures allocated to cache it).
2011-03-06 06:13:56 +00:00
static GQuark recursion_check_quark = 0;
static void
push_recursion_check (GtkWidget *widget,
sizerequest: Use GtkOrientation ... instead of GtkSizeGroupMode. Orientation is what we're interested in after all. When we need a GtkSizeGroupMode, we can do the translation where we need it.
2012-11-14 00:25:21 +00:00
GtkOrientation orientation,
Cache heights-for-range-of-widths instead of height for every width. This patch optimizes window resizes by assuming that if a widget has the same height at a width of 50 as with a width of 150, the height for width 100 will also be the same. The patch also further optimizes the cache allocator, now there are 2 pointer arrays of up to a maximum of 5 requests, the arrays will only be allocated if a request is ever made in that orientation and the array will be sparse until each request is made (i.e. if a label can only wrap to 3 lines, there will only be 3 out of a possible 5 SizeRequest structures allocated to cache it).
2011-03-06 06:13:56 +00:00
gint for_size)
{
const char *previous_method;
const char *method;
if (recursion_check_quark == 0)
recursion_check_quark = g_quark_from_static_string ("gtk-size-request-in-progress");
previous_method = g_object_get_qdata (G_OBJECT (widget), recursion_check_quark);
sizerequest: Use GtkOrientation ... instead of GtkSizeGroupMode. Orientation is what we're interested in after all. When we need a GtkSizeGroupMode, we can do the translation where we need it.
2012-11-14 00:25:21 +00:00
if (orientation == GTK_ORIENTATION_HORIZONTAL)
Cache heights-for-range-of-widths instead of height for every width. This patch optimizes window resizes by assuming that if a widget has the same height at a width of 50 as with a width of 150, the height for width 100 will also be the same. The patch also further optimizes the cache allocator, now there are 2 pointer arrays of up to a maximum of 5 requests, the arrays will only be allocated if a request is ever made in that orientation and the array will be sparse until each request is made (i.e. if a label can only wrap to 3 lines, there will only be 3 out of a possible 5 SizeRequest structures allocated to cache it).
2011-03-06 06:13:56 +00:00
{
method = for_size < 0 ? "get_width" : "get_width_for_height";
}
else
{
method = for_size < 0 ? "get_height" : "get_height_for_width";
}
if (previous_method != NULL)
{
g_warning ("%s %p: widget tried to gtk_widget_%s inside "
" GtkWidget ::%s implementation. "
"Should just invoke GTK_WIDGET_GET_CLASS(widget)->%s "
"directly rather than using gtk_widget_%s",
G_OBJECT_TYPE_NAME (widget), widget,
method, previous_method,
method, method);
}
g_object_set_qdata (G_OBJECT (widget), recursion_check_quark, (char*) method);
}
static void
pop_recursion_check (GtkWidget *widget,
sizerequest: Use GtkOrientation ... instead of GtkSizeGroupMode. Orientation is what we're interested in after all. When we need a GtkSizeGroupMode, we can do the translation where we need it.
2012-11-14 00:25:21 +00:00
GtkOrientation orientation)
Cache heights-for-range-of-widths instead of height for every width. This patch optimizes window resizes by assuming that if a widget has the same height at a width of 50 as with a width of 150, the height for width 100 will also be the same. The patch also further optimizes the cache allocator, now there are 2 pointer arrays of up to a maximum of 5 requests, the arrays will only be allocated if a request is ever made in that orientation and the array will be sparse until each request is made (i.e. if a label can only wrap to 3 lines, there will only be 3 out of a possible 5 SizeRequest structures allocated to cache it).
2011-03-06 06:13:56 +00:00
{
g_object_set_qdata (G_OBJECT (widget), recursion_check_quark, NULL);
}
size request: Redo the recursion checks Use G_ENABLE_CONSISTENCY checks for the recursion checks in gtksizerequest.c
2015-09-09 01:06:38 +00:00
#else
#define push_recursion_check(widget, orientation, for_size)
#define pop_recursion_check(widget, orientation)
#endif /* G_ENABLE_CONSISTENCY_CHECKS */
Cache heights-for-range-of-widths instead of height for every width. This patch optimizes window resizes by assuming that if a widget has the same height at a width of 50 as with a width of 150, the height for width 100 will also be the same. The patch also further optimizes the cache allocator, now there are 2 pointer arrays of up to a maximum of 5 requests, the arrays will only be allocated if a request is ever made in that orientation and the array will be sparse until each request is made (i.e. if a label can only wrap to 3 lines, there will only be 3 out of a possible 5 SizeRequest structures allocated to cache it).
2011-03-06 06:13:56 +00:00
sizerequest: Improve warning message Actually print out the function we're warning about
2012-05-07 15:37:36 +00:00
static const char *
sizerequest: Use GtkOrientation ... instead of GtkSizeGroupMode. Orientation is what we're interested in after all. When we need a GtkSizeGroupMode, we can do the translation where we need it.
2012-11-14 00:25:21 +00:00
get_vfunc_name (GtkOrientation orientation,
gint for_size)
sizerequest: Improve warning message Actually print out the function we're warning about
2012-05-07 15:37:36 +00:00
{
sizerequest: Use GtkOrientation ... instead of GtkSizeGroupMode. Orientation is what we're interested in after all. When we need a GtkSizeGroupMode, we can do the translation where we need it.
2012-11-14 00:25:21 +00:00
if (orientation == GTK_ORIENTATION_HORIZONTAL)
sizerequest: Improve warning message Actually print out the function we're warning about
2012-05-07 15:37:36 +00:00
return for_size < 0 ? "get_preferred_width" : "get_preferred_width_for_height";
else
return for_size < 0 ? "get_preferred_height" : "get_preferred_height_for_width";
}
Handle non-baseline supporting subclasses overriding baseline supporting classes If a subclass (say a child of GtkButton) overrides the non-baseline size request methods we need to call these, rather than the new get_height_and_baseline_for_width method. In order to handle this we make the default for this method to be NULL, and instead check at runtime which method to call. If any non-baseline vfunc has changed in a class but the baseline one hasn't, then we can't use the baseline one.
2013-03-27 09:22:14 +00:00
static gboolean
widget_class_has_baseline_support (GtkWidgetClass *widget_class)
{
GtkWidgetClass *parent_class;
if (widget_class->get_preferred_height_and_baseline_for_width == NULL)
return FALSE;
/* This is kinda hacky, but for backwards compatibility reasons we have to handle the case
where a class previously did not support get_preferred_height_and_baseline_for_width,
but then gained support for it, and a subclass of it overrides the previous non-baseline
methods. If this happens we need to call the overridden (non-baseline supporting) versions
on the subclass, rather than the inherited but not overriddent new get_preferred_height_and_baseline_for_width.
*/
/* Loop over all parent classes that inherit the same get_preferred_height_and_baseline_for_width */
parent_class = g_type_class_peek_parent (widget_class);
while (parent_class != NULL &&
parent_class->get_preferred_height_and_baseline_for_width == widget_class->get_preferred_height_and_baseline_for_width)
{
if (parent_class->get_preferred_height != widget_class->get_preferred_height ||
Fix indentation gcc 6 complains about this.
2016-02-05 10:42:28 +00:00
parent_class->get_preferred_height_for_width != widget_class->get_preferred_height_for_width)
return FALSE;
Handle non-baseline supporting subclasses overriding baseline supporting classes If a subclass (say a child of GtkButton) overrides the non-baseline size request methods we need to call these, rather than the new get_height_and_baseline_for_width method. In order to handle this we make the default for this method to be NULL, and instead check at runtime which method to call. If any non-baseline vfunc has changed in a class but the baseline one hasn't, then we can't use the baseline one.
2013-03-27 09:22:14 +00:00
Fix indentation gcc 6 complains about this.
2016-02-05 10:42:28 +00:00
parent_class = g_type_class_peek_parent (parent_class);
Handle non-baseline supporting subclasses overriding baseline supporting classes If a subclass (say a child of GtkButton) overrides the non-baseline size request methods we need to call these, rather than the new get_height_and_baseline_for_width method. In order to handle this we make the default for this method to be NULL, and instead check at runtime which method to call. If any non-baseline vfunc has changed in a class but the baseline one hasn't, then we can't use the baseline one.
2013-03-27 09:22:14 +00:00
}
return TRUE;
}
gboolean
_gtk_widget_has_baseline_support (GtkWidget *widget)
{
GtkWidgetClass *widget_class;
widget_class = GTK_WIDGET_GET_CLASS (widget);
return widget_class_has_baseline_support (widget_class);
}
sizerequest: Move sizegroups function to different source file
2012-11-04 15:02:14 +00:00
static void
sizerequest: Restructure code Make the compute_size_request() function take into account size groups itself instead of doing a weird "bump_requisition" call.
2012-11-04 15:10:20 +00:00
gtk_widget_query_size_for_orientation (GtkWidget *widget,
sizerequest: Use GtkOrientation ... instead of GtkSizeGroupMode. Orientation is what we're interested in after all. When we need a GtkSizeGroupMode, we can do the translation where we need it.
2012-11-14 00:25:21 +00:00
GtkOrientation orientation,
sizerequest: Restructure code Make the compute_size_request() function take into account size groups itself instead of doing a weird "bump_requisition" call.
2012-11-04 15:10:20 +00:00
gint for_size,
gint *minimum_size,
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
gint *natural_size,
gint *minimum_baseline,
gint *natural_baseline)
sizerequest: Move sizegroups function to different source file
2012-11-04 15:02:14 +00:00
{
sizerequestcache: Move lookup function ...and clean up its API.
2012-11-14 00:10:21 +00:00
SizeRequestCache *cache;
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
GtkWidgetClass *widget_class;
sizerequestcache: Move lookup function ...and clean up its API.
2012-11-14 00:10:21 +00:00
gint min_size = 0;
gint nat_size = 0;
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
gint min_baseline = -1;
gint nat_baseline = -1;
sizerequestcache: Move lookup function ...and clean up its API.
2012-11-14 00:10:21 +00:00
gboolean found_in_cache;
Some doc and formatting tweaks
2010-04-28 14:04:21 +00:00
widget: Add a resize_needed flag ... and API to set and unset it. It is set when gtk_widget_queue_resize() is called. It is unset when gtk_widget_get_preferred_width/height() is called. So far it is not used.
2015-09-28 00:19:25 +00:00
gtk_widget_ensure_resize (widget);
sizerequest: Optimize CONSTANT_SIZE better We can set for_size to -1 earlier than we did. Doing so makes sure we only cache one value (as we should in the first place). In GTK 3.6, this worked properly, but with Previously, this check was moved further up to avoid interacting with size groups. But after recent refactorings, size groups are handled way earlier anyway.
2012-11-14 13:03:47 +00:00
if (gtk_widget_get_request_mode (widget) == GTK_SIZE_REQUEST_CONSTANT_SIZE)
for_size = -1;
sizerequestcache: Move lookup function ...and clean up its API.
2012-11-14 00:10:21 +00:00
cache = _gtk_widget_peek_request_cache (widget);
found_in_cache = _gtk_size_request_cache_lookup (cache,
orientation,
for_size,
&min_size,
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
&nat_size,
&min_baseline,
&nat_baseline);
widget_class = GTK_WIDGET_GET_CLASS (widget);
sizerequestcache: Move lookup function ...and clean up its API.
2012-11-14 00:10:21 +00:00
Fixed GtkExtendedLayout interaction with sizegroups plus cleanups Fixed GtkExtendedLayout to interact with sizegroups, "size-requsts" and caching the values all in the same code segment. Migrated the cache code to be internal to gtkextendedlayout.c
2010-04-17 05:51:10 +00:00
if (!found_in_cache)
{
Cache heights-for-range-of-widths instead of height for every width. This patch optimizes window resizes by assuming that if a widget has the same height at a width of 50 as with a width of 150, the height for width 100 will also be the same. The patch also further optimizes the cache allocator, now there are 2 pointer arrays of up to a maximum of 5 requests, the arrays will only be allocated if a request is ever made in that orientation and the array will be sparse until each request is made (i.e. if a label can only wrap to 3 lines, there will only be 3 out of a possible 5 SizeRequest structures allocated to cache it).
2011-03-06 06:13:56 +00:00
gint adjusted_min, adjusted_natural, adjusted_for_size = for_size;
Fixed GtkExtendedLayout interaction with sizegroups plus cleanups Fixed GtkExtendedLayout to interact with sizegroups, "size-requsts" and caching the values all in the same code segment. Migrated the cache code to be internal to gtkextendedlayout.c
2010-04-17 05:51:10 +00:00
style: Add missing deprecation markers Some functions in gtkstyle.h were overlooked when we added the GDK_DEPRECATED macros. Also add IGNORE_DEPRECATIONS to the few remaining callers of those functions.
2013-04-02 09:44:08 +00:00
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
widget: Emit initial style-set signal in the same situations as GTK2 This ensures that widgets that aren't ported and rely on the style-set signal being emitted work as well as before. They should not rely on style-set being emitted however. Note that this function is a no-op if the initial style has been set already and is very cheap if it has not been set yet. It only becomes relevant if the resulting style actually gets used. https://bugzilla.gnome.org/show_bug.cgi?id=639584
2011-03-26 22:34:45 +00:00
gtk_widget_ensure_style (widget);
style: Add missing deprecation markers Some functions in gtkstyle.h were overlooked when we added the GDK_DEPRECATED macros. Also add IGNORE_DEPRECATIONS to the few remaining callers of those functions.
2013-04-02 09:44:08 +00:00
G_GNUC_END_IGNORE_DEPRECATIONS;
widget: Emit initial style-set signal in the same situations as GTK2 This ensures that widgets that aren't ported and rely on the style-set signal being emitted work as well as before. They should not rely on style-set being emitted however. Note that this function is a no-op if the initial style has been set already and is very cheap if it has not been set yet. It only becomes relevant if the resulting style actually gets used. https://bugzilla.gnome.org/show_bug.cgi?id=639584
2011-03-26 22:34:45 +00:00
sizerequest: Use GtkOrientation ... instead of GtkSizeGroupMode. Orientation is what we're interested in after all. When we need a GtkSizeGroupMode, we can do the translation where we need it.
2012-11-14 00:25:21 +00:00
if (orientation == GTK_ORIENTATION_HORIZONTAL)
Formatting and typo fixes
2010-04-24 01:52:55 +00:00
{
sizerequest: Optimize CONSTANT_SIZE better We can set for_size to -1 earlier than we did. Doing so makes sure we only cache one value (as we should in the first place). In GTK 3.6, this worked properly, but with Previously, this check was moved further up to avoid interacting with size groups. But after recent refactorings, size groups are handled way earlier anyway.
2012-11-14 13:03:47 +00:00
if (for_size < 0)
Fixed problems with combination of height-for-width apis and alignment/margin vfuncs adjust_size_request/allocation Now get_height_for_width() will internally update the for_width before passing it to the real height_for_width() vfunc, allowing margins and extra space for alignments to be stripped, thus requesting sufficient height for greater than natural widths (and also accounting for margins properly). Test case adjusted in testadjustsize to ensure proper behavior.
2010-10-22 15:04:46 +00:00
{
Stop calling GtkWidget parameters 'request' There were at least a few places where we were using GTK_WIDGET() on something that was already a GtkWidget*, just because it was named wrong.
2010-10-26 14:53:46 +00:00
push_recursion_check (widget, orientation, for_size);
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
widget_class->get_preferred_width (widget, &min_size, &nat_size);
Stop calling GtkWidget parameters 'request' There were at least a few places where we were using GTK_WIDGET() on something that was already a GtkWidget*, just because it was named wrong.
2010-10-26 14:53:46 +00:00
pop_recursion_check (widget, orientation);
Fixed problems with combination of height-for-width apis and alignment/margin vfuncs adjust_size_request/allocation Now get_height_for_width() will internally update the for_width before passing it to the real height_for_width() vfunc, allowing margins and extra space for alignments to be stripped, thus requesting sufficient height for greater than natural widths (and also accounting for margins properly). Test case adjusted in testadjustsize to ensure proper behavior.
2010-10-22 15:04:46 +00:00
}
Formatting and typo fixes
2010-04-24 01:52:55 +00:00
else
Fixed problems with combination of height-for-width apis and alignment/margin vfuncs adjust_size_request/allocation Now get_height_for_width() will internally update the for_width before passing it to the real height_for_width() vfunc, allowing margins and extra space for alignments to be stripped, thus requesting sufficient height for greater than natural widths (and also accounting for margins properly). Test case adjusted in testadjustsize to ensure proper behavior.
2010-10-22 15:04:46 +00:00
{
Added minimum size parameter to GtkWidgetClass->adjust_size_allocation. This allows us to add a check before executing ->get_preferred_height_for_width() to ensure we always request for at least the minimum required size (and lets us remove the warning in gtkcontainer.c telling implementors to do this check manually from thier container implementations).
2010-12-07 14:45:48 +00:00
gint ignored_position = 0;
gint minimum_height;
gint natural_height;
Fixed problems with combination of height-for-width apis and alignment/margin vfuncs adjust_size_request/allocation Now get_height_for_width() will internally update the for_width before passing it to the real height_for_width() vfunc, allowing margins and extra space for alignments to be stripped, thus requesting sufficient height for greater than natural widths (and also accounting for margins properly). Test case adjusted in testadjustsize to ensure proper behavior.
2010-10-22 15:04:46 +00:00
GtkWidget/GtkContainer: Slight fixes to geometry-management docs. Replace it's with its in several places. Replace some , with . Replace some ; with . Fix some plurals. Other minor corrections.
2010-11-04 15:30:48 +00:00
/* Pull the base natural height from the cache as it's needed to adjust
Fixed problems with combination of height-for-width apis and alignment/margin vfuncs adjust_size_request/allocation Now get_height_for_width() will internally update the for_width before passing it to the real height_for_width() vfunc, allowing margins and extra space for alignments to be stripped, thus requesting sufficient height for greater than natural widths (and also accounting for margins properly). Test case adjusted in testadjustsize to ensure proper behavior.
2010-10-22 15:04:46 +00:00
* the proposed 'for_size' */
Added minimum size parameter to GtkWidgetClass->adjust_size_allocation. This allows us to add a check before executing ->get_preferred_height_for_width() to ensure we always request for at least the minimum required size (and lets us remove the warning in gtkcontainer.c telling implementors to do this check manually from thier container implementations).
2010-12-07 14:45:48 +00:00
gtk_widget_get_preferred_height (widget, &minimum_height, &natural_height);
Fixed problems with combination of height-for-width apis and alignment/margin vfuncs adjust_size_request/allocation Now get_height_for_width() will internally update the for_width before passing it to the real height_for_width() vfunc, allowing margins and extra space for alignments to be stripped, thus requesting sufficient height for greater than natural widths (and also accounting for margins properly). Test case adjusted in testadjustsize to ensure proper behavior.
2010-10-22 15:04:46 +00:00
/* convert for_size to unadjusted height (for_size is a proposed allocation) */
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
widget_class->adjust_size_allocation (widget,
GTK_ORIENTATION_VERTICAL,
&minimum_height,
&natural_height,
&ignored_position,
&adjusted_for_size);
Stop calling GtkWidget parameters 'request' There were at least a few places where we were using GTK_WIDGET() on something that was already a GtkWidget*, just because it was named wrong.
2010-10-26 14:53:46 +00:00
push_recursion_check (widget, orientation, for_size);
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
widget_class->get_preferred_width_for_height (widget,
MAX (adjusted_for_size, minimum_height),
&min_size, &nat_size);
Stop calling GtkWidget parameters 'request' There were at least a few places where we were using GTK_WIDGET() on something that was already a GtkWidget*, just because it was named wrong.
2010-10-26 14:53:46 +00:00
pop_recursion_check (widget, orientation);
Fixed problems with combination of height-for-width apis and alignment/margin vfuncs adjust_size_request/allocation Now get_height_for_width() will internally update the for_width before passing it to the real height_for_width() vfunc, allowing margins and extra space for alignments to be stripped, thus requesting sufficient height for greater than natural widths (and also accounting for margins properly). Test case adjusted in testadjustsize to ensure proper behavior.
2010-10-22 15:04:46 +00:00
}
Formatting and typo fixes
2010-04-24 01:52:55 +00:00
}
Fixed GtkExtendedLayout interaction with sizegroups plus cleanups Fixed GtkExtendedLayout to interact with sizegroups, "size-requsts" and caching the values all in the same code segment. Migrated the cache code to be internal to gtkextendedlayout.c
2010-04-17 05:51:10 +00:00
else
Formatting and typo fixes
2010-04-24 01:52:55 +00:00
{
sizerequest: Optimize CONSTANT_SIZE better We can set for_size to -1 earlier than we did. Doing so makes sure we only cache one value (as we should in the first place). In GTK 3.6, this worked properly, but with Previously, this check was moved further up to avoid interacting with size groups. But after recent refactorings, size groups are handled way earlier anyway.
2012-11-14 13:03:47 +00:00
if (for_size < 0)
Fixed problems with combination of height-for-width apis and alignment/margin vfuncs adjust_size_request/allocation Now get_height_for_width() will internally update the for_width before passing it to the real height_for_width() vfunc, allowing margins and extra space for alignments to be stripped, thus requesting sufficient height for greater than natural widths (and also accounting for margins properly). Test case adjusted in testadjustsize to ensure proper behavior.
2010-10-22 15:04:46 +00:00
{
Stop calling GtkWidget parameters 'request' There were at least a few places where we were using GTK_WIDGET() on something that was already a GtkWidget*, just because it was named wrong.
2010-10-26 14:53:46 +00:00
push_recursion_check (widget, orientation, for_size);
Handle non-baseline supporting subclasses overriding baseline supporting classes If a subclass (say a child of GtkButton) overrides the non-baseline size request methods we need to call these, rather than the new get_height_and_baseline_for_width method. In order to handle this we make the default for this method to be NULL, and instead check at runtime which method to call. If any non-baseline vfunc has changed in a class but the baseline one hasn't, then we can't use the baseline one.
2013-03-27 09:22:14 +00:00
if (widget_class_has_baseline_support (widget_class))
widget_class->get_preferred_height_and_baseline_for_width (widget, -1,
&min_size, &nat_size,
&min_baseline, &nat_baseline);
else
widget_class->get_preferred_height (widget, &min_size, &nat_size);
Stop calling GtkWidget parameters 'request' There were at least a few places where we were using GTK_WIDGET() on something that was already a GtkWidget*, just because it was named wrong.
2010-10-26 14:53:46 +00:00
pop_recursion_check (widget, orientation);
Fixed problems with combination of height-for-width apis and alignment/margin vfuncs adjust_size_request/allocation Now get_height_for_width() will internally update the for_width before passing it to the real height_for_width() vfunc, allowing margins and extra space for alignments to be stripped, thus requesting sufficient height for greater than natural widths (and also accounting for margins properly). Test case adjusted in testadjustsize to ensure proper behavior.
2010-10-22 15:04:46 +00:00
}
Formatting and typo fixes
2010-04-24 01:52:55 +00:00
else
Fixed problems with combination of height-for-width apis and alignment/margin vfuncs adjust_size_request/allocation Now get_height_for_width() will internally update the for_width before passing it to the real height_for_width() vfunc, allowing margins and extra space for alignments to be stripped, thus requesting sufficient height for greater than natural widths (and also accounting for margins properly). Test case adjusted in testadjustsize to ensure proper behavior.
2010-10-22 15:04:46 +00:00
{
Cache heights-for-range-of-widths instead of height for every width. This patch optimizes window resizes by assuming that if a widget has the same height at a width of 50 as with a width of 150, the height for width 100 will also be the same. The patch also further optimizes the cache allocator, now there are 2 pointer arrays of up to a maximum of 5 requests, the arrays will only be allocated if a request is ever made in that orientation and the array will be sparse until each request is made (i.e. if a label can only wrap to 3 lines, there will only be 3 out of a possible 5 SizeRequest structures allocated to cache it).
2011-03-06 06:13:56 +00:00
gint ignored_position = 0;
gint minimum_width;
gint natural_width;
Fixed problems with combination of height-for-width apis and alignment/margin vfuncs adjust_size_request/allocation Now get_height_for_width() will internally update the for_width before passing it to the real height_for_width() vfunc, allowing margins and extra space for alignments to be stripped, thus requesting sufficient height for greater than natural widths (and also accounting for margins properly). Test case adjusted in testadjustsize to ensure proper behavior.
2010-10-22 15:04:46 +00:00
GtkWidget/GtkContainer: Slight fixes to geometry-management docs. Replace it's with its in several places. Replace some , with . Replace some ; with . Fix some plurals. Other minor corrections.
2010-11-04 15:30:48 +00:00
/* Pull the base natural width from the cache as it's needed to adjust
Fixed problems with combination of height-for-width apis and alignment/margin vfuncs adjust_size_request/allocation Now get_height_for_width() will internally update the for_width before passing it to the real height_for_width() vfunc, allowing margins and extra space for alignments to be stripped, thus requesting sufficient height for greater than natural widths (and also accounting for margins properly). Test case adjusted in testadjustsize to ensure proper behavior.
2010-10-22 15:04:46 +00:00
* the proposed 'for_size' */
Added minimum size parameter to GtkWidgetClass->adjust_size_allocation. This allows us to add a check before executing ->get_preferred_height_for_width() to ensure we always request for at least the minimum required size (and lets us remove the warning in gtkcontainer.c telling implementors to do this check manually from thier container implementations).
2010-12-07 14:45:48 +00:00
gtk_widget_get_preferred_width (widget, &minimum_width, &natural_width);
Fixed problems with combination of height-for-width apis and alignment/margin vfuncs adjust_size_request/allocation Now get_height_for_width() will internally update the for_width before passing it to the real height_for_width() vfunc, allowing margins and extra space for alignments to be stripped, thus requesting sufficient height for greater than natural widths (and also accounting for margins properly). Test case adjusted in testadjustsize to ensure proper behavior.
2010-10-22 15:04:46 +00:00
/* convert for_size to unadjusted width (for_size is a proposed allocation) */
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
widget_class->adjust_size_allocation (widget,
GTK_ORIENTATION_HORIZONTAL,
&minimum_width,
&natural_width,
&ignored_position,
&adjusted_for_size);
Stop calling GtkWidget parameters 'request' There were at least a few places where we were using GTK_WIDGET() on something that was already a GtkWidget*, just because it was named wrong.
2010-10-26 14:53:46 +00:00
push_recursion_check (widget, orientation, for_size);
Handle non-baseline supporting subclasses overriding baseline supporting classes If a subclass (say a child of GtkButton) overrides the non-baseline size request methods we need to call these, rather than the new get_height_and_baseline_for_width method. In order to handle this we make the default for this method to be NULL, and instead check at runtime which method to call. If any non-baseline vfunc has changed in a class but the baseline one hasn't, then we can't use the baseline one.
2013-03-27 09:22:14 +00:00
if (widget_class_has_baseline_support (widget_class))
widget_class->get_preferred_height_and_baseline_for_width (widget, MAX (adjusted_for_size, minimum_width),
&min_size, &nat_size,
&min_baseline, &nat_baseline);
else
widget_class->get_preferred_height_for_width (widget, MAX (adjusted_for_size, minimum_width),
&min_size, &nat_size);
Stop calling GtkWidget parameters 'request' There were at least a few places where we were using GTK_WIDGET() on something that was already a GtkWidget*, just because it was named wrong.
2010-10-26 14:53:46 +00:00
pop_recursion_check (widget, orientation);
Fixed problems with combination of height-for-width apis and alignment/margin vfuncs adjust_size_request/allocation Now get_height_for_width() will internally update the for_width before passing it to the real height_for_width() vfunc, allowing margins and extra space for alignments to be stripped, thus requesting sufficient height for greater than natural widths (and also accounting for margins properly). Test case adjusted in testadjustsize to ensure proper behavior.
2010-10-22 15:04:46 +00:00
}
Formatting and typo fixes
2010-04-24 01:52:55 +00:00
}
Fixed GtkExtendedLayout interaction with sizegroups plus cleanups Fixed GtkExtendedLayout to interact with sizegroups, "size-requsts" and caching the values all in the same code segment. Migrated the cache code to be internal to gtkextendedlayout.c
2010-04-17 05:51:10 +00:00
Warn if a widget requests minimum size > natural size Since this makes no sense and there's no reason we should have to check for it elsewhere just in case some widget is busted. https://bugzilla.gnome.org/show_bug.cgi?id=628808
2010-09-06 01:46:22 +00:00
if (min_size > nat_size)
{
sizerequest: Improve warning message Actually print out the function we're warning about
2012-05-07 15:37:36 +00:00
g_warning ("%s %p reported min size %d and natural size %d in %s(); natural size must be >= min size",
G_OBJECT_TYPE_NAME (widget), widget, min_size, nat_size, get_vfunc_name (orientation, for_size));
Warn if a widget requests minimum size > natural size Since this makes no sense and there's no reason we should have to check for it elsewhere just in case some widget is busted. https://bugzilla.gnome.org/show_bug.cgi?id=628808
2010-09-06 01:46:22 +00:00
}
Cache heights-for-range-of-widths instead of height for every width. This patch optimizes window resizes by assuming that if a widget has the same height at a width of 50 as with a width of 150, the height for width 100 will also be the same. The patch also further optimizes the cache allocator, now there are 2 pointer arrays of up to a maximum of 5 requests, the arrays will only be allocated if a request is ever made in that orientation and the array will be sparse until each request is made (i.e. if a label can only wrap to 3 lines, there will only be 3 out of a possible 5 SizeRequest structures allocated to cache it).
2011-03-06 06:13:56 +00:00
adjusted_min = min_size;
adjusted_natural = nat_size;
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
widget_class->adjust_size_request (widget,
orientation,
&adjusted_min,
&adjusted_natural);
GtkWidget: add adjust_size_request adjust_size_allocation virtual funcs Use these new methods to handle set_size_request (aka aux_info) inside gtkwidget.c, instead of having external code mess with it. The virtual functions can be used for other purposes in the future. For example, GtkContainer::border_width could be automatically implemented for all container subclasses.
2010-09-05 16:19:14 +00:00
Cache heights-for-range-of-widths instead of height for every width. This patch optimizes window resizes by assuming that if a widget has the same height at a width of 50 as with a width of 150, the height for width 100 will also be the same. The patch also further optimizes the cache allocator, now there are 2 pointer arrays of up to a maximum of 5 requests, the arrays will only be allocated if a request is ever made in that orientation and the array will be sparse until each request is made (i.e. if a label can only wrap to 3 lines, there will only be 3 out of a possible 5 SizeRequest structures allocated to cache it).
2011-03-06 06:13:56 +00:00
if (adjusted_min < min_size ||
adjusted_natural < nat_size)
GtkWidget: add adjust_size_request adjust_size_allocation virtual funcs Use these new methods to handle set_size_request (aka aux_info) inside gtkwidget.c, instead of having external code mess with it. The virtual functions can be used for other purposes in the future. For example, GtkContainer::border_width could be automatically implemented for all container subclasses.
2010-09-05 16:19:14 +00:00
{
g_warning ("%s %p adjusted size %s min %d natural %d must not decrease below min %d natural %d",
Stop calling GtkWidget parameters 'request' There were at least a few places where we were using GTK_WIDGET() on something that was already a GtkWidget*, just because it was named wrong.
2010-10-26 14:53:46 +00:00
G_OBJECT_TYPE_NAME (widget), widget,
sizerequest: Use GtkOrientation ... instead of GtkSizeGroupMode. Orientation is what we're interested in after all. When we need a GtkSizeGroupMode, we can do the translation where we need it.
2012-11-14 00:25:21 +00:00
orientation == GTK_ORIENTATION_VERTICAL ? "vertical" : "horizontal",
GtkWidget: add adjust_size_request adjust_size_allocation virtual funcs Use these new methods to handle set_size_request (aka aux_info) inside gtkwidget.c, instead of having external code mess with it. The virtual functions can be used for other purposes in the future. For example, GtkContainer::border_width could be automatically implemented for all container subclasses.
2010-09-05 16:19:14 +00:00
adjusted_min, adjusted_natural,
Cache heights-for-range-of-widths instead of height for every width. This patch optimizes window resizes by assuming that if a widget has the same height at a width of 50 as with a width of 150, the height for width 100 will also be the same. The patch also further optimizes the cache allocator, now there are 2 pointer arrays of up to a maximum of 5 requests, the arrays will only be allocated if a request is ever made in that orientation and the array will be sparse until each request is made (i.e. if a label can only wrap to 3 lines, there will only be 3 out of a possible 5 SizeRequest structures allocated to cache it).
2011-03-06 06:13:56 +00:00
min_size, nat_size);
GtkWidget: add adjust_size_request adjust_size_allocation virtual funcs Use these new methods to handle set_size_request (aka aux_info) inside gtkwidget.c, instead of having external code mess with it. The virtual functions can be used for other purposes in the future. For example, GtkContainer::border_width could be automatically implemented for all container subclasses.
2010-09-05 16:19:14 +00:00
/* don't use the adjustment */
}
else if (adjusted_min > adjusted_natural)
{
g_warning ("%s %p adjusted size %s min %d natural %d original min %d natural %d has min greater than natural",
Stop calling GtkWidget parameters 'request' There were at least a few places where we were using GTK_WIDGET() on something that was already a GtkWidget*, just because it was named wrong.
2010-10-26 14:53:46 +00:00
G_OBJECT_TYPE_NAME (widget), widget,
sizerequest: Use GtkOrientation ... instead of GtkSizeGroupMode. Orientation is what we're interested in after all. When we need a GtkSizeGroupMode, we can do the translation where we need it.
2012-11-14 00:25:21 +00:00
orientation == GTK_ORIENTATION_VERTICAL ? "vertical" : "horizontal",
GtkWidget: add adjust_size_request adjust_size_allocation virtual funcs Use these new methods to handle set_size_request (aka aux_info) inside gtkwidget.c, instead of having external code mess with it. The virtual functions can be used for other purposes in the future. For example, GtkContainer::border_width could be automatically implemented for all container subclasses.
2010-09-05 16:19:14 +00:00
adjusted_min, adjusted_natural,
Cache heights-for-range-of-widths instead of height for every width. This patch optimizes window resizes by assuming that if a widget has the same height at a width of 50 as with a width of 150, the height for width 100 will also be the same. The patch also further optimizes the cache allocator, now there are 2 pointer arrays of up to a maximum of 5 requests, the arrays will only be allocated if a request is ever made in that orientation and the array will be sparse until each request is made (i.e. if a label can only wrap to 3 lines, there will only be 3 out of a possible 5 SizeRequest structures allocated to cache it).
2011-03-06 06:13:56 +00:00
min_size, nat_size);
GtkWidget: add adjust_size_request adjust_size_allocation virtual funcs Use these new methods to handle set_size_request (aka aux_info) inside gtkwidget.c, instead of having external code mess with it. The virtual functions can be used for other purposes in the future. For example, GtkContainer::border_width could be automatically implemented for all container subclasses.
2010-09-05 16:19:14 +00:00
/* don't use the adjustment */
}
else
{
/* adjustment looks good */
Cache heights-for-range-of-widths instead of height for every width. This patch optimizes window resizes by assuming that if a widget has the same height at a width of 50 as with a width of 150, the height for width 100 will also be the same. The patch also further optimizes the cache allocator, now there are 2 pointer arrays of up to a maximum of 5 requests, the arrays will only be allocated if a request is ever made in that orientation and the array will be sparse until each request is made (i.e. if a label can only wrap to 3 lines, there will only be 3 out of a possible 5 SizeRequest structures allocated to cache it).
2011-03-06 06:13:56 +00:00
min_size = adjusted_min;
nat_size = adjusted_natural;
GtkWidget: add adjust_size_request adjust_size_allocation virtual funcs Use these new methods to handle set_size_request (aka aux_info) inside gtkwidget.c, instead of having external code mess with it. The virtual functions can be used for other purposes in the future. For example, GtkContainer::border_width could be automatically implemented for all container subclasses.
2010-09-05 16:19:14 +00:00
}
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
if (min_baseline != -1 || nat_baseline != -1)
{
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
g_warning ("%s %p reported a horizontal baseline",
G_OBJECT_TYPE_NAME (widget), widget);
min_baseline = -1;
nat_baseline = -1;
}
else if (min_baseline == -1 || nat_baseline == -1)
{
g_warning ("%s %p reported baseline for only one of min/natural (min: %d, natural: %d)",
G_OBJECT_TYPE_NAME (widget), widget,
min_baseline, nat_baseline);
min_baseline = -1;
nat_baseline = -1;
}
else if (gtk_widget_get_valign_with_baseline (widget) != GTK_ALIGN_BASELINE)
{
/* Ignore requested baseline for non-aligned widgets */
min_baseline = -1;
nat_baseline = -1;
}
else
widget_class->adjust_baseline_request (widget,
&min_baseline,
&nat_baseline);
}
sizerequestcache: Move lookup function ...and clean up its API.
2012-11-14 00:10:21 +00:00
_gtk_size_request_cache_commit (cache,
sizerequestcache: Move commit function
2012-11-13 23:55:50 +00:00
orientation,
for_size,
min_size,
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
nat_size,
min_baseline,
nat_baseline);
Cache heights-for-range-of-widths instead of height for every width. This patch optimizes window resizes by assuming that if a widget has the same height at a width of 50 as with a width of 150, the height for width 100 will also be the same. The patch also further optimizes the cache allocator, now there are 2 pointer arrays of up to a maximum of 5 requests, the arrays will only be allocated if a request is ever made in that orientation and the array will be sparse until each request is made (i.e. if a label can only wrap to 3 lines, there will only be 3 out of a possible 5 SizeRequest structures allocated to cache it).
2011-03-06 06:13:56 +00:00
}
Fixed GtkExtendedLayout interaction with sizegroups plus cleanups Fixed GtkExtendedLayout to interact with sizegroups, "size-requsts" and caching the values all in the same code segment. Migrated the cache code to be internal to gtkextendedlayout.c
2010-04-17 05:51:10 +00:00
if (minimum_size)
Cache heights-for-range-of-widths instead of height for every width. This patch optimizes window resizes by assuming that if a widget has the same height at a width of 50 as with a width of 150, the height for width 100 will also be the same. The patch also further optimizes the cache allocator, now there are 2 pointer arrays of up to a maximum of 5 requests, the arrays will only be allocated if a request is ever made in that orientation and the array will be sparse until each request is made (i.e. if a label can only wrap to 3 lines, there will only be 3 out of a possible 5 SizeRequest structures allocated to cache it).
2011-03-06 06:13:56 +00:00
*minimum_size = min_size;
Some doc and formatting tweaks
2010-04-28 14:04:21 +00:00
Fixed GtkExtendedLayout interaction with sizegroups plus cleanups Fixed GtkExtendedLayout to interact with sizegroups, "size-requsts" and caching the values all in the same code segment. Migrated the cache code to be internal to gtkextendedlayout.c
2010-04-17 05:51:10 +00:00
if (natural_size)
Cache heights-for-range-of-widths instead of height for every width. This patch optimizes window resizes by assuming that if a widget has the same height at a width of 50 as with a width of 150, the height for width 100 will also be the same. The patch also further optimizes the cache allocator, now there are 2 pointer arrays of up to a maximum of 5 requests, the arrays will only be allocated if a request is ever made in that orientation and the array will be sparse until each request is made (i.e. if a label can only wrap to 3 lines, there will only be 3 out of a possible 5 SizeRequest structures allocated to cache it).
2011-03-06 06:13:56 +00:00
*natural_size = nat_size;
Fixed GtkExtendedLayout interaction with sizegroups plus cleanups Fixed GtkExtendedLayout to interact with sizegroups, "size-requsts" and caching the values all in the same code segment. Migrated the cache code to be internal to gtkextendedlayout.c
2010-04-17 05:51:10 +00:00
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
if (minimum_baseline)
*minimum_baseline = min_baseline;
if (natural_baseline)
*natural_baseline = nat_baseline;
Cache heights-for-range-of-widths instead of height for every width. This patch optimizes window resizes by assuming that if a widget has the same height at a width of 50 as with a width of 150, the height for width 100 will also be the same. The patch also further optimizes the cache allocator, now there are 2 pointer arrays of up to a maximum of 5 requests, the arrays will only be allocated if a request is ever made in that orientation and the array will be sparse until each request is made (i.e. if a label can only wrap to 3 lines, there will only be 3 out of a possible 5 SizeRequest structures allocated to cache it).
2011-03-06 06:13:56 +00:00
g_assert (min_size <= nat_size);
Fixed GtkExtendedLayout interaction with sizegroups plus cleanups Fixed GtkExtendedLayout to interact with sizegroups, "size-requsts" and caching the values all in the same code segment. Migrated the cache code to be internal to gtkextendedlayout.c
2010-04-17 05:51:10 +00:00
Don't use g_print for debug output The g_print documentation explicitly says not to do this, since g_print is meant to be redirected by applications. Instead use g_message for logging that can be triggered via GTK_DEBUG.
2016-02-28 20:33:18 +00:00
GTK_NOTE (SIZE_REQUEST, {
GString *s;
s = g_string_new ("");
g_string_append_printf (s, "[%p] %s\t%s: %d is minimum %d and natural: %d",
widget, G_OBJECT_TYPE_NAME (widget),
orientation == GTK_ORIENTATION_HORIZONTAL
? "width for height"
: "height for width",
for_size, min_size, nat_size);
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
if (min_baseline != -1 || nat_baseline != -1)
Don't use g_print for debug output The g_print documentation explicitly says not to do this, since g_print is meant to be redirected by applications. Instead use g_message for logging that can be triggered via GTK_DEBUG.
2016-02-28 20:33:18 +00:00
g_string_append_printf (s, ", baseline %d/%d",
min_baseline, nat_baseline);
g_string_append_printf (s, " (hit cache: %s)\n",
found_in_cache ? "yes" : "no");
g_message ("%s", s->str);
g_string_free (s, TRUE);
});
sizerequest: Restructure code Make the compute_size_request() function take into account size groups itself instead of doing a weird "bump_requisition" call.
2012-11-04 15:10:20 +00:00
}
/* This is the main function that checks for a cached size and
* possibly queries the widget class to compute the size if it's
* not cached. If the for_size here is -1, then get_preferred_width()
* or get_preferred_height() will be used.
*/
widget: make gtk_widget_compute_size_for_orientation() static It's not used anywhere outside of gtksizerequest.c anymore.
2013-05-11 13:11:53 +00:00
static void
gtk_widget_compute_size_for_orientation (GtkWidget *widget,
GtkOrientation orientation,
gint for_size,
gint *minimum,
gint *natural,
gint *minimum_baseline,
gint *natural_baseline)
sizerequest: Restructure code Make the compute_size_request() function take into account size groups itself instead of doing a weird "bump_requisition" call.
2012-11-04 15:10:20 +00:00
{
GHashTable *widgets;
GHashTableIter iter;
gpointer key;
gint min_result = 0, nat_result = 0;
Move GtkWidgetPrivate to gtkwidgetprivate.h This lets us use inlined getters for members in there, avoiding the type checks in the public getters.
2015-09-06 23:58:03 +00:00
if (!_gtk_widget_get_visible (widget) && !_gtk_widget_is_toplevel (widget))
sizerequest: Make invisible widgets return a 0x0 size.
2013-01-08 11:26:04 +00:00
{
if (minimum)
*minimum = 0;
if (natural)
*natural = 0;
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
if (minimum_baseline)
*minimum_baseline = -1;
if (natural_baseline)
*natural_baseline = -1;
sizerequest: Make invisible widgets return a 0x0 size.
2013-01-08 11:26:04 +00:00
return;
}
sizerequest: Restructure code Make the compute_size_request() function take into account size groups itself instead of doing a weird "bump_requisition" call.
2012-11-04 15:10:20 +00:00
if (G_LIKELY (!_gtk_widget_get_sizegroups (widget)))
{
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
gtk_widget_query_size_for_orientation (widget, orientation, for_size, minimum, natural,
minimum_baseline, natural_baseline);
sizerequest: Restructure code Make the compute_size_request() function take into account size groups itself instead of doing a weird "bump_requisition" call.
2012-11-04 15:10:20 +00:00
return;
}
Fixed GtkExtendedLayout interaction with sizegroups plus cleanups Fixed GtkExtendedLayout to interact with sizegroups, "size-requsts" and caching the values all in the same code segment. Migrated the cache code to be internal to gtkextendedlayout.c
2010-04-17 05:51:10 +00:00
sizerequest: Use GtkOrientation ... instead of GtkSizeGroupMode. Orientation is what we're interested in after all. When we need a GtkSizeGroupMode, we can do the translation where we need it.
2012-11-14 00:25:21 +00:00
widgets = _gtk_size_group_get_widget_peers (widget, orientation);
sizerequest: Restructure code Make the compute_size_request() function take into account size groups itself instead of doing a weird "bump_requisition" call.
2012-11-04 15:10:20 +00:00
g_hash_table_iter_init (&iter, widgets);
while (g_hash_table_iter_next (&iter, &key, NULL))
{
GtkWidget *tmp_widget = key;
gint min_dimension, nat_dimension;
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
gtk_widget_query_size_for_orientation (tmp_widget, orientation, for_size, &min_dimension, &nat_dimension, NULL, NULL);
sizerequest: Restructure code Make the compute_size_request() function take into account size groups itself instead of doing a weird "bump_requisition" call.
2012-11-04 15:10:20 +00:00
min_result = MAX (min_result, min_dimension);
nat_result = MAX (nat_result, nat_dimension);
}
g_hash_table_destroy (widgets);
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
/* Baselines make no sense with sizegroups really */
if (minimum_baseline)
*minimum_baseline = -1;
if (natural_baseline)
*natural_baseline = -1;
sizerequest: do not derefence NULL pointers
2012-11-04 16:42:55 +00:00
if (minimum)
*minimum = min_result;
if (natural)
*natural = nat_result;
Fixed GtkExtendedLayout interaction with sizegroups plus cleanups Fixed GtkExtendedLayout to interact with sizegroups, "size-requsts" and caching the values all in the same code segment. Migrated the cache code to be internal to gtkextendedlayout.c
2010-04-17 05:51:10 +00:00
}
Added gtk_extended_layout_is_height_for_width() Added an indicator telling whether a widget prefers to be allocated as height-for-width or width-for-height. Usually this depends on the orientation of a container or the nature of a content widget like GtkLabel. This indicator is only used in the seldom case where a parent is allocating free space to the child and the child can flow in either direction, GtkWindow and GtkScrolledWindow are users of this api.
2010-04-11 02:32:55 +00:00
/**
Fixing documentation of gtk_widget_get_request_mode()
2010-09-27 06:11:27 +00:00
* gtk_widget_get_request_mode:
Move GtkSizeRequest into GtkWidget It doesn't make sense to keep them separate as GtkSizeRequest requires a GtkWidget and GtkWidget implements GtkSizeRequest, so you can never have one without the other. It also makes the code a lot easier because no casts are required when calling functions. Also, the names would translate to gtk_widget_get_width() and people agreed that this would be a too generic name, so a "preferred" was added to the names. So this patch moves the functions: gtk_size_request_get_request_mode() => gtk_widget_get_request_mode() gtk_size_request_get_width() => gtk_widget_get_preferred_width() gtk_size_request_get_height() => gtk_widget_get_preferred_height() gtk_size_request_get_size() => gtk_widget_get_preferred_size() gtk_size_request_get_width_for_height() => gtk_widget_get_preferred_width_for_height() gtk_size_request_get_height_for_width() => gtk_widget_get_preferred_height_for_width() ... and moves the corresponding vfuncs to the GtkWidgetClass. The patch also renames the implementations of the vfuncs in widgets to include the word "preferrred".
2010-09-21 14:35:17 +00:00
* @widget: a #GtkWidget instance
Added gtk_extended_layout_is_height_for_width() Added an indicator telling whether a widget prefers to be allocated as height-for-width or width-for-height. Usually this depends on the orientation of a container or the nature of a content widget like GtkLabel. This indicator is only used in the seldom case where a parent is allocating free space to the child and the child can flow in either direction, GtkWindow and GtkScrolledWindow are users of this api.
2010-04-11 02:32:55 +00:00
*
* Gets whether the widget prefers a height-for-width layout
Formatting and typo fixes
2010-04-24 01:52:55 +00:00
* or a width-for-height layout.
*
Docs: Don't use note elements In most cases, the text itself makes the message clear enough.
2014-02-02 06:22:14 +00:00
* #GtkBin widgets generally propagate the preference of
Formatting and typo fixes
2010-04-24 01:52:55 +00:00
* their child, container widgets need to request something either in
* context of their children or in context of their allocation
Docs: Don't use note elements In most cases, the text itself makes the message clear enough.
2014-02-02 06:22:14 +00:00
* capabilities.
Added gtk_extended_layout_is_height_for_width() Added an indicator telling whether a widget prefers to be allocated as height-for-width or width-for-height. Usually this depends on the orientation of a container or the nature of a content widget like GtkLabel. This indicator is only used in the seldom case where a parent is allocating free space to the child and the child can flow in either direction, GtkWindow and GtkScrolledWindow are users of this api.
2010-04-11 02:32:55 +00:00
*
Added gtk_distribute_allocation() Added a convenience api for containers to use when allocating children (used to distribute space evenly to children).
2010-08-05 16:45:48 +00:00
* Returns: The #GtkSizeRequestMode preferred by @widget.
Added gtk_extended_layout_is_height_for_width() Added an indicator telling whether a widget prefers to be allocated as height-for-width or width-for-height. Usually this depends on the orientation of a container or the nature of a content widget like GtkLabel. This indicator is only used in the seldom case where a parent is allocating free space to the child and the child can flow in either direction, GtkWindow and GtkScrolledWindow are users of this api.
2010-04-11 02:32:55 +00:00
*
* Since: 3.0
*/
Mass api change from GtkExtendedLayout --> GtkSizeRequest This commit makes a few massive changes to the extended layout code: a.) gtkextendedlayout.c --> gtksizerequest.c b.) _is_height_for_width --> get_request_mode() c.) get_desired_size(), get_desired_width(), get_desired_height() --> get_size(), get_width(), get_height() This is the first partial commit and only effects portions of the tree that have already been merged in master (in order to easily cherry pick this commit). Conflicts: gtk/Makefile.am gtk/gtk.h gtk/gtk.symbols gtk/gtkextendedlayout.h
2010-06-18 04:11:26 +00:00
GtkSizeRequestMode
Move GtkSizeRequest into GtkWidget It doesn't make sense to keep them separate as GtkSizeRequest requires a GtkWidget and GtkWidget implements GtkSizeRequest, so you can never have one without the other. It also makes the code a lot easier because no casts are required when calling functions. Also, the names would translate to gtk_widget_get_width() and people agreed that this would be a too generic name, so a "preferred" was added to the names. So this patch moves the functions: gtk_size_request_get_request_mode() => gtk_widget_get_request_mode() gtk_size_request_get_width() => gtk_widget_get_preferred_width() gtk_size_request_get_height() => gtk_widget_get_preferred_height() gtk_size_request_get_size() => gtk_widget_get_preferred_size() gtk_size_request_get_width_for_height() => gtk_widget_get_preferred_width_for_height() gtk_size_request_get_height_for_width() => gtk_widget_get_preferred_height_for_width() ... and moves the corresponding vfuncs to the GtkWidgetClass. The patch also renames the implementations of the vfuncs in widgets to include the word "preferrred".
2010-09-21 14:35:17 +00:00
gtk_widget_get_request_mode (GtkWidget *widget)
Added gtk_extended_layout_is_height_for_width() Added an indicator telling whether a widget prefers to be allocated as height-for-width or width-for-height. Usually this depends on the orientation of a container or the nature of a content widget like GtkLabel. This indicator is only used in the seldom case where a parent is allocating free space to the child and the child can flow in either direction, GtkWindow and GtkScrolledWindow are users of this api.
2010-04-11 02:32:55 +00:00
{
sizerequest: Cache the request mode ... in the GtkSizeRequestCache. That way, we only need to query it once, and can remove the caching code from GtkContainer.
2012-11-13 21:02:53 +00:00
SizeRequestCache *cache;
cache = _gtk_widget_peek_request_cache (widget);
Remove type check from gtk_widget_get_request_mode
2015-09-11 13:08:36 +00:00
if (G_UNLIKELY (!cache->request_mode_valid))
sizerequest: Cache the request mode ... in the GtkSizeRequestCache. That way, we only need to query it once, and can remove the caching code from GtkContainer.
2012-11-13 21:02:53 +00:00
{
cache->request_mode = GTK_WIDGET_GET_CLASS (widget)->get_request_mode (widget);
cache->request_mode_valid = TRUE;
}
return cache->request_mode;
Added gtk_extended_layout_is_height_for_width() Added an indicator telling whether a widget prefers to be allocated as height-for-width or width-for-height. Usually this depends on the orientation of a container or the nature of a content widget like GtkLabel. This indicator is only used in the seldom case where a parent is allocating free space to the child and the child can flow in either direction, GtkWindow and GtkScrolledWindow are users of this api.
2010-04-11 02:32:55 +00:00
}
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
/**
Move GtkSizeRequest into GtkWidget It doesn't make sense to keep them separate as GtkSizeRequest requires a GtkWidget and GtkWidget implements GtkSizeRequest, so you can never have one without the other. It also makes the code a lot easier because no casts are required when calling functions. Also, the names would translate to gtk_widget_get_width() and people agreed that this would be a too generic name, so a "preferred" was added to the names. So this patch moves the functions: gtk_size_request_get_request_mode() => gtk_widget_get_request_mode() gtk_size_request_get_width() => gtk_widget_get_preferred_width() gtk_size_request_get_height() => gtk_widget_get_preferred_height() gtk_size_request_get_size() => gtk_widget_get_preferred_size() gtk_size_request_get_width_for_height() => gtk_widget_get_preferred_width_for_height() gtk_size_request_get_height_for_width() => gtk_widget_get_preferred_height_for_width() ... and moves the corresponding vfuncs to the GtkWidgetClass. The patch also renames the implementations of the vfuncs in widgets to include the word "preferrred".
2010-09-21 14:35:17 +00:00
* gtk_widget_get_preferred_width:
* @widget: a #GtkWidget instance
[GtkExtendedLayout] Add annotations Add missing annotations for out values.
2010-05-12 22:53:43 +00:00
* @minimum_width: (out) (allow-none): location to store the minimum width, or %NULL
* @natural_width: (out) (allow-none): location to store the natural width, or %NULL
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
*
docs: use proper apostrophe https://wiki.gnome.org/Design/OS/Typography
2014-02-07 18:01:26 +00:00
* Retrieves a widget’s initial minimum and natural width.
Added documentation, implemented gtk_extended_layout_is_height_for_width() where needed.
2010-04-21 05:32:55 +00:00
*
Docs: Don't use note elements In most cases, the text itself makes the message clear enough.
2014-02-02 06:22:14 +00:00
* This call is specific to height-for-width requests.
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
*
Rename h/v-align to h/valign And adjust the getters and setters to match. Also include some documentation by Havoc Pennington about adjustment of size requests and allocations.
2010-09-15 22:37:20 +00:00
* The returned request will be modified by the
* GtkWidgetClass::adjust_size_request virtual method and by any
Docs: Remove all entities and turn off sgml mode With all element markup gone, it is time to turn off sgml mode, and get rid of entities as well.
2014-02-09 22:24:06 +00:00
* #GtkSizeGroups that have been applied. That is, the returned request
Rename h/v-align to h/valign And adjust the getters and setters to match. Also include some documentation by Havoc Pennington about adjustment of size requests and allocations.
2010-09-15 22:37:20 +00:00
* is the one that should be used for layout, not necessarily the one
* returned by the widget itself.
*
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
* Since: 3.0
*/
void
Move GtkSizeRequest into GtkWidget It doesn't make sense to keep them separate as GtkSizeRequest requires a GtkWidget and GtkWidget implements GtkSizeRequest, so you can never have one without the other. It also makes the code a lot easier because no casts are required when calling functions. Also, the names would translate to gtk_widget_get_width() and people agreed that this would be a too generic name, so a "preferred" was added to the names. So this patch moves the functions: gtk_size_request_get_request_mode() => gtk_widget_get_request_mode() gtk_size_request_get_width() => gtk_widget_get_preferred_width() gtk_size_request_get_height() => gtk_widget_get_preferred_height() gtk_size_request_get_size() => gtk_widget_get_preferred_size() gtk_size_request_get_width_for_height() => gtk_widget_get_preferred_width_for_height() gtk_size_request_get_height_for_width() => gtk_widget_get_preferred_height_for_width() ... and moves the corresponding vfuncs to the GtkWidgetClass. The patch also renames the implementations of the vfuncs in widgets to include the word "preferrred".
2010-09-21 14:35:17 +00:00
gtk_widget_get_preferred_width (GtkWidget *widget,
gint *minimum_width,
gint *natural_width)
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
{
Added GTK_SIZE_REQUEST_CONSTANT_SIZE to GtkSizeRequestMode The constant size request mode defines a request mode where height-for-width geometry is unneeded, thus optimizing GTK+ by reducing the overall amount of requests that need to be performed and cached while resizing an interface.
2011-03-05 08:49:49 +00:00
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (minimum_width != NULL || natural_width != NULL);
widget: make gtk_widget_compute_size_for_orientation() static It's not used anywhere outside of gtksizerequest.c anymore.
2013-05-11 13:11:53 +00:00
gtk_widget_compute_size_for_orientation (widget,
GTK_ORIENTATION_HORIZONTAL,
-1,
minimum_width,
natural_width,
NULL, NULL);
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
}
/**
Move GtkSizeRequest into GtkWidget It doesn't make sense to keep them separate as GtkSizeRequest requires a GtkWidget and GtkWidget implements GtkSizeRequest, so you can never have one without the other. It also makes the code a lot easier because no casts are required when calling functions. Also, the names would translate to gtk_widget_get_width() and people agreed that this would be a too generic name, so a "preferred" was added to the names. So this patch moves the functions: gtk_size_request_get_request_mode() => gtk_widget_get_request_mode() gtk_size_request_get_width() => gtk_widget_get_preferred_width() gtk_size_request_get_height() => gtk_widget_get_preferred_height() gtk_size_request_get_size() => gtk_widget_get_preferred_size() gtk_size_request_get_width_for_height() => gtk_widget_get_preferred_width_for_height() gtk_size_request_get_height_for_width() => gtk_widget_get_preferred_height_for_width() ... and moves the corresponding vfuncs to the GtkWidgetClass. The patch also renames the implementations of the vfuncs in widgets to include the word "preferrred".
2010-09-21 14:35:17 +00:00
* gtk_widget_get_preferred_height:
* @widget: a #GtkWidget instance
[GtkExtendedLayout] Add annotations Add missing annotations for out values.
2010-05-12 22:53:43 +00:00
* @minimum_height: (out) (allow-none): location to store the minimum height, or %NULL
* @natural_height: (out) (allow-none): location to store the natural height, or %NULL
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
*
docs: use proper apostrophe https://wiki.gnome.org/Design/OS/Typography
2014-02-07 18:01:26 +00:00
* Retrieves a widget’s initial minimum and natural height.
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
*
Docs: Don't use note elements In most cases, the text itself makes the message clear enough.
2014-02-02 06:22:14 +00:00
* This call is specific to width-for-height requests.
Added documentation, implemented gtk_extended_layout_is_height_for_width() where needed.
2010-04-21 05:32:55 +00:00
*
Rename h/v-align to h/valign And adjust the getters and setters to match. Also include some documentation by Havoc Pennington about adjustment of size requests and allocations.
2010-09-15 22:37:20 +00:00
* The returned request will be modified by the
* GtkWidgetClass::adjust_size_request virtual method and by any
Docs: Remove all entities and turn off sgml mode With all element markup gone, it is time to turn off sgml mode, and get rid of entities as well.
2014-02-09 22:24:06 +00:00
* #GtkSizeGroups that have been applied. That is, the returned request
Rename h/v-align to h/valign And adjust the getters and setters to match. Also include some documentation by Havoc Pennington about adjustment of size requests and allocations.
2010-09-15 22:37:20 +00:00
* is the one that should be used for layout, not necessarily the one
* returned by the widget itself.
*
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
* Since: 3.0
*/
void
Move GtkSizeRequest into GtkWidget It doesn't make sense to keep them separate as GtkSizeRequest requires a GtkWidget and GtkWidget implements GtkSizeRequest, so you can never have one without the other. It also makes the code a lot easier because no casts are required when calling functions. Also, the names would translate to gtk_widget_get_width() and people agreed that this would be a too generic name, so a "preferred" was added to the names. So this patch moves the functions: gtk_size_request_get_request_mode() => gtk_widget_get_request_mode() gtk_size_request_get_width() => gtk_widget_get_preferred_width() gtk_size_request_get_height() => gtk_widget_get_preferred_height() gtk_size_request_get_size() => gtk_widget_get_preferred_size() gtk_size_request_get_width_for_height() => gtk_widget_get_preferred_width_for_height() gtk_size_request_get_height_for_width() => gtk_widget_get_preferred_height_for_width() ... and moves the corresponding vfuncs to the GtkWidgetClass. The patch also renames the implementations of the vfuncs in widgets to include the word "preferrred".
2010-09-21 14:35:17 +00:00
gtk_widget_get_preferred_height (GtkWidget *widget,
gint *minimum_height,
gint *natural_height)
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
{
Added GTK_SIZE_REQUEST_CONSTANT_SIZE to GtkSizeRequestMode The constant size request mode defines a request mode where height-for-width geometry is unneeded, thus optimizing GTK+ by reducing the overall amount of requests that need to be performed and cached while resizing an interface.
2011-03-05 08:49:49 +00:00
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (minimum_height != NULL || natural_height != NULL);
widget: make gtk_widget_compute_size_for_orientation() static It's not used anywhere outside of gtksizerequest.c anymore.
2013-05-11 13:11:53 +00:00
gtk_widget_compute_size_for_orientation (widget,
GTK_ORIENTATION_VERTICAL,
-1,
minimum_height,
natural_height,
NULL, NULL);
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
}
Added gtk_extended_layout_is_height_for_width() Added an indicator telling whether a widget prefers to be allocated as height-for-width or width-for-height. Usually this depends on the orientation of a container or the nature of a content widget like GtkLabel. This indicator is only used in the seldom case where a parent is allocating free space to the child and the child can flow in either direction, GtkWindow and GtkScrolledWindow are users of this api.
2010-04-11 02:32:55 +00:00
native-layout: Introduce GtkExtendedLayout interface.
2009-12-02 08:48:42 +00:00
/**
Move GtkSizeRequest into GtkWidget It doesn't make sense to keep them separate as GtkSizeRequest requires a GtkWidget and GtkWidget implements GtkSizeRequest, so you can never have one without the other. It also makes the code a lot easier because no casts are required when calling functions. Also, the names would translate to gtk_widget_get_width() and people agreed that this would be a too generic name, so a "preferred" was added to the names. So this patch moves the functions: gtk_size_request_get_request_mode() => gtk_widget_get_request_mode() gtk_size_request_get_width() => gtk_widget_get_preferred_width() gtk_size_request_get_height() => gtk_widget_get_preferred_height() gtk_size_request_get_size() => gtk_widget_get_preferred_size() gtk_size_request_get_width_for_height() => gtk_widget_get_preferred_width_for_height() gtk_size_request_get_height_for_width() => gtk_widget_get_preferred_height_for_width() ... and moves the corresponding vfuncs to the GtkWidgetClass. The patch also renames the implementations of the vfuncs in widgets to include the word "preferrred".
2010-09-21 14:35:17 +00:00
* gtk_widget_get_preferred_width_for_height:
* @widget: a #GtkWidget instance
Integrate GtkExtendedLayout docs
2010-05-01 03:21:58 +00:00
* @height: the height which is available for allocation
[GtkExtendedLayout] Add annotations Add missing annotations for out values.
2010-05-12 22:53:43 +00:00
* @minimum_width: (out) (allow-none): location for storing the minimum width, or %NULL
* @natural_width: (out) (allow-none): location for storing the natural width, or %NULL
native-layout: Introduce GtkExtendedLayout interface.
2009-12-02 08:48:42 +00:00
*
docs: use proper apostrophe https://wiki.gnome.org/Design/OS/Typography
2014-02-07 18:01:26 +00:00
* Retrieves a widget’s minimum and natural width if it would be given
Make GtkWidget a prerequisite of extended layout As it is not allowed to called gtk_extended_layout_get_desired_size() on a GtkWidget directly; gtk_widget_get_desired_size() was really an ambiguous api. This patch removes the added GtkWidget api, calls the appropriate sizegroup code which in turn envokes the interface vtable, this patch also accordingly makes GtkWidget a prerequisite of GtkExtendedLayout (the api doesnt work for cell renderers anyway, patch comming...).
2010-04-06 06:47:20 +00:00
* the specified @height.
native-layout: Introduce GtkExtendedLayout interface.
2009-12-02 08:48:42 +00:00
*
Rename h/v-align to h/valign And adjust the getters and setters to match. Also include some documentation by Havoc Pennington about adjustment of size requests and allocations.
2010-09-15 22:37:20 +00:00
* The returned request will be modified by the
* GtkWidgetClass::adjust_size_request virtual method and by any
Docs: Remove all entities and turn off sgml mode With all element markup gone, it is time to turn off sgml mode, and get rid of entities as well.
2014-02-09 22:24:06 +00:00
* #GtkSizeGroups that have been applied. That is, the returned request
Rename h/v-align to h/valign And adjust the getters and setters to match. Also include some documentation by Havoc Pennington about adjustment of size requests and allocations.
2010-09-15 22:37:20 +00:00
* is the one that should be used for layout, not necessarily the one
* returned by the widget itself.
*
Make GtkWidget a prerequisite of extended layout As it is not allowed to called gtk_extended_layout_get_desired_size() on a GtkWidget directly; gtk_widget_get_desired_size() was really an ambiguous api. This patch removes the added GtkWidget api, calls the appropriate sizegroup code which in turn envokes the interface vtable, this patch also accordingly makes GtkWidget a prerequisite of GtkExtendedLayout (the api doesnt work for cell renderers anyway, patch comming...).
2010-04-06 06:47:20 +00:00
* Since: 3.0
native-layout: Introduce GtkExtendedLayout interface.
2009-12-02 08:48:42 +00:00
*/
void
Move GtkSizeRequest into GtkWidget It doesn't make sense to keep them separate as GtkSizeRequest requires a GtkWidget and GtkWidget implements GtkSizeRequest, so you can never have one without the other. It also makes the code a lot easier because no casts are required when calling functions. Also, the names would translate to gtk_widget_get_width() and people agreed that this would be a too generic name, so a "preferred" was added to the names. So this patch moves the functions: gtk_size_request_get_request_mode() => gtk_widget_get_request_mode() gtk_size_request_get_width() => gtk_widget_get_preferred_width() gtk_size_request_get_height() => gtk_widget_get_preferred_height() gtk_size_request_get_size() => gtk_widget_get_preferred_size() gtk_size_request_get_width_for_height() => gtk_widget_get_preferred_width_for_height() gtk_size_request_get_height_for_width() => gtk_widget_get_preferred_height_for_width() ... and moves the corresponding vfuncs to the GtkWidgetClass. The patch also renames the implementations of the vfuncs in widgets to include the word "preferrred".
2010-09-21 14:35:17 +00:00
gtk_widget_get_preferred_width_for_height (GtkWidget *widget,
gint height,
gint *minimum_width,
gint *natural_width)
native-layout: Introduce GtkExtendedLayout interface.
2009-12-02 08:48:42 +00:00
{
Added GTK_SIZE_REQUEST_CONSTANT_SIZE to GtkSizeRequestMode The constant size request mode defines a request mode where height-for-width geometry is unneeded, thus optimizing GTK+ by reducing the overall amount of requests that need to be performed and cached while resizing an interface.
2011-03-05 08:49:49 +00:00
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (minimum_width != NULL || natural_width != NULL);
g_return_if_fail (height >= 0);
widget: make gtk_widget_compute_size_for_orientation() static It's not used anywhere outside of gtksizerequest.c anymore.
2013-05-11 13:11:53 +00:00
gtk_widget_compute_size_for_orientation (widget,
GTK_ORIENTATION_HORIZONTAL,
height,
minimum_width,
natural_width,
NULL, NULL);
native-layout: Introduce GtkExtendedLayout interface.
2009-12-02 08:48:42 +00:00
}
/**
Move GtkSizeRequest into GtkWidget It doesn't make sense to keep them separate as GtkSizeRequest requires a GtkWidget and GtkWidget implements GtkSizeRequest, so you can never have one without the other. It also makes the code a lot easier because no casts are required when calling functions. Also, the names would translate to gtk_widget_get_width() and people agreed that this would be a too generic name, so a "preferred" was added to the names. So this patch moves the functions: gtk_size_request_get_request_mode() => gtk_widget_get_request_mode() gtk_size_request_get_width() => gtk_widget_get_preferred_width() gtk_size_request_get_height() => gtk_widget_get_preferred_height() gtk_size_request_get_size() => gtk_widget_get_preferred_size() gtk_size_request_get_width_for_height() => gtk_widget_get_preferred_width_for_height() gtk_size_request_get_height_for_width() => gtk_widget_get_preferred_height_for_width() ... and moves the corresponding vfuncs to the GtkWidgetClass. The patch also renames the implementations of the vfuncs in widgets to include the word "preferrred".
2010-09-21 14:35:17 +00:00
* gtk_widget_get_preferred_height_for_width:
* @widget: a #GtkWidget instance
Integrate GtkExtendedLayout docs
2010-05-01 03:21:58 +00:00
* @width: the width which is available for allocation
[GtkExtendedLayout] Add annotations Add missing annotations for out values.
2010-05-12 22:53:43 +00:00
* @minimum_height: (out) (allow-none): location for storing the minimum height, or %NULL
* @natural_height: (out) (allow-none): location for storing the natural height, or %NULL
native-layout: Introduce GtkExtendedLayout interface.
2009-12-02 08:48:42 +00:00
*
docs: use proper apostrophe https://wiki.gnome.org/Design/OS/Typography
2014-02-07 18:01:26 +00:00
* Retrieves a widget’s minimum and natural height if it would be given
Make GtkWidget a prerequisite of extended layout As it is not allowed to called gtk_extended_layout_get_desired_size() on a GtkWidget directly; gtk_widget_get_desired_size() was really an ambiguous api. This patch removes the added GtkWidget api, calls the appropriate sizegroup code which in turn envokes the interface vtable, this patch also accordingly makes GtkWidget a prerequisite of GtkExtendedLayout (the api doesnt work for cell renderers anyway, patch comming...).
2010-04-06 06:47:20 +00:00
* the specified @width.
native-layout: Introduce GtkExtendedLayout interface.
2009-12-02 08:48:42 +00:00
*
Rename h/v-align to h/valign And adjust the getters and setters to match. Also include some documentation by Havoc Pennington about adjustment of size requests and allocations.
2010-09-15 22:37:20 +00:00
* The returned request will be modified by the
* GtkWidgetClass::adjust_size_request virtual method and by any
Docs: Remove all entities and turn off sgml mode With all element markup gone, it is time to turn off sgml mode, and get rid of entities as well.
2014-02-09 22:24:06 +00:00
* #GtkSizeGroups that have been applied. That is, the returned request
Rename h/v-align to h/valign And adjust the getters and setters to match. Also include some documentation by Havoc Pennington about adjustment of size requests and allocations.
2010-09-15 22:37:20 +00:00
* is the one that should be used for layout, not necessarily the one
* returned by the widget itself.
*
Make GtkWidget a prerequisite of extended layout As it is not allowed to called gtk_extended_layout_get_desired_size() on a GtkWidget directly; gtk_widget_get_desired_size() was really an ambiguous api. This patch removes the added GtkWidget api, calls the appropriate sizegroup code which in turn envokes the interface vtable, this patch also accordingly makes GtkWidget a prerequisite of GtkExtendedLayout (the api doesnt work for cell renderers anyway, patch comming...).
2010-04-06 06:47:20 +00:00
* Since: 3.0
native-layout: Introduce GtkExtendedLayout interface.
2009-12-02 08:48:42 +00:00
*/
void
Move GtkSizeRequest into GtkWidget It doesn't make sense to keep them separate as GtkSizeRequest requires a GtkWidget and GtkWidget implements GtkSizeRequest, so you can never have one without the other. It also makes the code a lot easier because no casts are required when calling functions. Also, the names would translate to gtk_widget_get_width() and people agreed that this would be a too generic name, so a "preferred" was added to the names. So this patch moves the functions: gtk_size_request_get_request_mode() => gtk_widget_get_request_mode() gtk_size_request_get_width() => gtk_widget_get_preferred_width() gtk_size_request_get_height() => gtk_widget_get_preferred_height() gtk_size_request_get_size() => gtk_widget_get_preferred_size() gtk_size_request_get_width_for_height() => gtk_widget_get_preferred_width_for_height() gtk_size_request_get_height_for_width() => gtk_widget_get_preferred_height_for_width() ... and moves the corresponding vfuncs to the GtkWidgetClass. The patch also renames the implementations of the vfuncs in widgets to include the word "preferrred".
2010-09-21 14:35:17 +00:00
gtk_widget_get_preferred_height_for_width (GtkWidget *widget,
gint width,
gint *minimum_height,
gint *natural_height)
native-layout: Introduce GtkExtendedLayout interface.
2009-12-02 08:48:42 +00:00
{
Added GTK_SIZE_REQUEST_CONSTANT_SIZE to GtkSizeRequestMode The constant size request mode defines a request mode where height-for-width geometry is unneeded, thus optimizing GTK+ by reducing the overall amount of requests that need to be performed and cached while resizing an interface.
2011-03-05 08:49:49 +00:00
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (minimum_height != NULL || natural_height != NULL);
g_return_if_fail (width >= 0);
widget: make gtk_widget_compute_size_for_orientation() static It's not used anywhere outside of gtksizerequest.c anymore.
2013-05-11 13:11:53 +00:00
gtk_widget_compute_size_for_orientation (widget,
GTK_ORIENTATION_VERTICAL,
width,
minimum_height,
natural_height,
NULL, NULL);
native-layout: Introduce GtkExtendedLayout interface.
2009-12-02 08:48:42 +00:00
}
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
/**
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
* gtk_widget_get_preferred_height_and_baseline_for_width:
* @widget: a #GtkWidget instance
* @width: the width which is available for allocation, or -1 if none
* @minimum_height: (out) (allow-none): location for storing the minimum height, or %NULL
* @natural_height: (out) (allow-none): location for storing the natural height, or %NULL
* @minimum_baseline: (out) (allow-none): location for storing the baseline for the minimum height, or %NULL
* @natural_baseline: (out) (allow-none): location for storing the baseline for the natural height, or %NULL
*
docs: use proper apostrophe https://wiki.gnome.org/Design/OS/Typography
2014-02-07 18:01:26 +00:00
* Retrieves a widget’s minimum and natural height and the corresponding baselines if it would be given
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
* the specified @width, or the default height if @width is -1. The baselines may be -1 which means
* that no baseline is requested for this widget.
*
* The returned request will be modified by the
* GtkWidgetClass::adjust_size_request and GtkWidgetClass::adjust_baseline_request virtual methods
Docs: Remove all entities and turn off sgml mode With all element markup gone, it is time to turn off sgml mode, and get rid of entities as well.
2014-02-09 22:24:06 +00:00
* and by any #GtkSizeGroups that have been applied. That is, the returned request
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
* is the one that should be used for layout, not necessarily the one
* returned by the widget itself.
*
* Since: 3.10
*/
void
gtk_widget_get_preferred_height_and_baseline_for_width (GtkWidget *widget,
gint width,
gint *minimum_height,
gint *natural_height,
gint *minimum_baseline,
gint *natural_baseline)
{
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (minimum_height != NULL || natural_height != NULL);
g_return_if_fail (width >= -1);
widget: make gtk_widget_compute_size_for_orientation() static It's not used anywhere outside of gtksizerequest.c anymore.
2013-05-11 13:11:53 +00:00
gtk_widget_compute_size_for_orientation (widget,
GTK_ORIENTATION_VERTICAL,
width,
minimum_height,
natural_height,
minimum_baseline,
natural_baseline);
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
}
API: Don't export gtk_widget_preferred_size_and_baseline() gtk_widget_preferred_size() is only useful if you want to quickly port a widget from GTK2 sizing code to GTK3 but does not properly work with height-for-width as used in GTK. So we don't want to encourage people to use it. In particular we want people to convert to height-for-width before adding baseline support to their widgets.
2013-05-11 12:29:29 +00:00
/*
* _gtk_widget_get_preferred_size_and_baseline:
Move GtkSizeRequest into GtkWidget It doesn't make sense to keep them separate as GtkSizeRequest requires a GtkWidget and GtkWidget implements GtkSizeRequest, so you can never have one without the other. It also makes the code a lot easier because no casts are required when calling functions. Also, the names would translate to gtk_widget_get_width() and people agreed that this would be a too generic name, so a "preferred" was added to the names. So this patch moves the functions: gtk_size_request_get_request_mode() => gtk_widget_get_request_mode() gtk_size_request_get_width() => gtk_widget_get_preferred_width() gtk_size_request_get_height() => gtk_widget_get_preferred_height() gtk_size_request_get_size() => gtk_widget_get_preferred_size() gtk_size_request_get_width_for_height() => gtk_widget_get_preferred_width_for_height() gtk_size_request_get_height_for_width() => gtk_widget_get_preferred_height_for_width() ... and moves the corresponding vfuncs to the GtkWidgetClass. The patch also renames the implementations of the vfuncs in widgets to include the word "preferrred".
2010-09-21 14:35:17 +00:00
* @widget: a #GtkWidget instance
[GtkExtendedLayout] Add annotations Add missing annotations for out values.
2010-05-12 22:53:43 +00:00
* @minimum_size: (out) (allow-none): location for storing the minimum size, or %NULL
* @natural_size: (out) (allow-none): location for storing the natural size, or %NULL
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
*
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
* Retrieves the minimum and natural size and the corresponding baselines of a widget, taking
docs: use proper apostrophe https://wiki.gnome.org/Design/OS/Typography
2014-02-07 18:01:26 +00:00
* into account the widget’s preference for height-for-width management. The baselines may
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
* be -1 which means that no baseline is requested for this widget.
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
*
Formatting and typo fixes
2010-04-24 01:52:55 +00:00
* This is used to retrieve a suitable size by container widgets which do
Migrated old GtkSizeRequestIface documentation to GtkWidget and added notes to gtk_widget_get_preferred_size().
2010-10-08 14:10:42 +00:00
* not impose any restrictions on the child placement. It can be used
* to deduce toplevel window and menu sizes as well as child widgets in
GtkWidget/GtkContainer: Slight fixes to geometry-management docs. Replace it's with its in several places. Replace some , with . Replace some ; with . Fix some plurals. Other minor corrections.
2010-11-04 15:30:48 +00:00
* free-form containers such as GtkLayout.
Migrated old GtkSizeRequestIface documentation to GtkWidget and added notes to gtk_widget_get_preferred_size().
2010-10-08 14:10:42 +00:00
*
Docs: Don't use note elements In most cases, the text itself makes the message clear enough.
2014-02-02 06:22:14 +00:00
* Handle with care. Note that the natural height of a height-for-width
Migrated old GtkSizeRequestIface documentation to GtkWidget and added notes to gtk_widget_get_preferred_size().
2010-10-08 14:10:42 +00:00
* widget will generally be a smaller size than the minimum height, since the required
* height for the natural width is generally smaller than the required height for
Docs: Don't use note elements In most cases, the text itself makes the message clear enough.
2014-02-02 06:22:14 +00:00
* the minimum width.
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
*/
void
API: Don't export gtk_widget_preferred_size_and_baseline() gtk_widget_preferred_size() is only useful if you want to quickly port a widget from GTK2 sizing code to GTK3 but does not properly work with height-for-width as used in GTK. So we don't want to encourage people to use it. In particular we want people to convert to height-for-width before adding baseline support to their widgets.
2013-05-11 12:29:29 +00:00
_gtk_widget_get_preferred_size_and_baseline (GtkWidget *widget,
GtkRequisition *minimum_size,
GtkRequisition *natural_size,
gint *minimum_baseline,
gint *natural_baseline)
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
{
gint min_width, nat_width;
gint min_height, nat_height;
Move GtkSizeRequest into GtkWidget It doesn't make sense to keep them separate as GtkSizeRequest requires a GtkWidget and GtkWidget implements GtkSizeRequest, so you can never have one without the other. It also makes the code a lot easier because no casts are required when calling functions. Also, the names would translate to gtk_widget_get_width() and people agreed that this would be a too generic name, so a "preferred" was added to the names. So this patch moves the functions: gtk_size_request_get_request_mode() => gtk_widget_get_request_mode() gtk_size_request_get_width() => gtk_widget_get_preferred_width() gtk_size_request_get_height() => gtk_widget_get_preferred_height() gtk_size_request_get_size() => gtk_widget_get_preferred_size() gtk_size_request_get_width_for_height() => gtk_widget_get_preferred_width_for_height() gtk_size_request_get_height_for_width() => gtk_widget_get_preferred_height_for_width() ... and moves the corresponding vfuncs to the GtkWidgetClass. The patch also renames the implementations of the vfuncs in widgets to include the word "preferrred".
2010-09-21 14:35:17 +00:00
g_return_if_fail (GTK_IS_WIDGET (widget));
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
Move GtkSizeRequest into GtkWidget It doesn't make sense to keep them separate as GtkSizeRequest requires a GtkWidget and GtkWidget implements GtkSizeRequest, so you can never have one without the other. It also makes the code a lot easier because no casts are required when calling functions. Also, the names would translate to gtk_widget_get_width() and people agreed that this would be a too generic name, so a "preferred" was added to the names. So this patch moves the functions: gtk_size_request_get_request_mode() => gtk_widget_get_request_mode() gtk_size_request_get_width() => gtk_widget_get_preferred_width() gtk_size_request_get_height() => gtk_widget_get_preferred_height() gtk_size_request_get_size() => gtk_widget_get_preferred_size() gtk_size_request_get_width_for_height() => gtk_widget_get_preferred_width_for_height() gtk_size_request_get_height_for_width() => gtk_widget_get_preferred_height_for_width() ... and moves the corresponding vfuncs to the GtkWidgetClass. The patch also renames the implementations of the vfuncs in widgets to include the word "preferrred".
2010-09-21 14:35:17 +00:00
if (gtk_widget_get_request_mode (widget) == GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH)
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
{
Move GtkSizeRequest into GtkWidget It doesn't make sense to keep them separate as GtkSizeRequest requires a GtkWidget and GtkWidget implements GtkSizeRequest, so you can never have one without the other. It also makes the code a lot easier because no casts are required when calling functions. Also, the names would translate to gtk_widget_get_width() and people agreed that this would be a too generic name, so a "preferred" was added to the names. So this patch moves the functions: gtk_size_request_get_request_mode() => gtk_widget_get_request_mode() gtk_size_request_get_width() => gtk_widget_get_preferred_width() gtk_size_request_get_height() => gtk_widget_get_preferred_height() gtk_size_request_get_size() => gtk_widget_get_preferred_size() gtk_size_request_get_width_for_height() => gtk_widget_get_preferred_width_for_height() gtk_size_request_get_height_for_width() => gtk_widget_get_preferred_height_for_width() ... and moves the corresponding vfuncs to the GtkWidgetClass. The patch also renames the implementations of the vfuncs in widgets to include the word "preferrred".
2010-09-21 14:35:17 +00:00
gtk_widget_get_preferred_width (widget, &min_width, &nat_width);
Mass api change from GtkExtendedLayout --> GtkSizeRequest This commit makes a few massive changes to the extended layout code: a.) gtkextendedlayout.c --> gtksizerequest.c b.) _is_height_for_width --> get_request_mode() c.) get_desired_size(), get_desired_width(), get_desired_height() --> get_size(), get_width(), get_height() This is the first partial commit and only effects portions of the tree that have already been merged in master (in order to easily cherry pick this commit). Conflicts: gtk/Makefile.am gtk/gtk.h gtk/gtk.symbols gtk/gtkextendedlayout.h
2010-06-18 04:11:26 +00:00
if (minimum_size)
{
minimum_size->width = min_width;
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
gtk_widget_get_preferred_height_and_baseline_for_width (widget, min_width,
&minimum_size->height, NULL, minimum_baseline, NULL);
Mass api change from GtkExtendedLayout --> GtkSizeRequest This commit makes a few massive changes to the extended layout code: a.) gtkextendedlayout.c --> gtksizerequest.c b.) _is_height_for_width --> get_request_mode() c.) get_desired_size(), get_desired_width(), get_desired_height() --> get_size(), get_width(), get_height() This is the first partial commit and only effects portions of the tree that have already been merged in master (in order to easily cherry pick this commit). Conflicts: gtk/Makefile.am gtk/gtk.h gtk/gtk.symbols gtk/gtkextendedlayout.h
2010-06-18 04:11:26 +00:00
}
if (natural_size)
{
natural_size->width = nat_width;
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
gtk_widget_get_preferred_height_and_baseline_for_width (widget, nat_width,
NULL, &natural_size->height, NULL, natural_baseline);
Mass api change from GtkExtendedLayout --> GtkSizeRequest This commit makes a few massive changes to the extended layout code: a.) gtkextendedlayout.c --> gtksizerequest.c b.) _is_height_for_width --> get_request_mode() c.) get_desired_size(), get_desired_width(), get_desired_height() --> get_size(), get_width(), get_height() This is the first partial commit and only effects portions of the tree that have already been merged in master (in order to easily cherry pick this commit). Conflicts: gtk/Makefile.am gtk/gtk.h gtk/gtk.symbols gtk/gtkextendedlayout.h
2010-06-18 04:11:26 +00:00
}
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
}
Added GTK_SIZE_REQUEST_CONSTANT_SIZE to GtkSizeRequestMode The constant size request mode defines a request mode where height-for-width geometry is unneeded, thus optimizing GTK+ by reducing the overall amount of requests that need to be performed and cached while resizing an interface.
2011-03-05 08:49:49 +00:00
else /* GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT or CONSTANT_SIZE */
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
{
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
gtk_widget_get_preferred_height_and_baseline_for_width (widget, -1, &min_height, &nat_height, minimum_baseline, natural_baseline);
Mass api change from GtkExtendedLayout --> GtkSizeRequest This commit makes a few massive changes to the extended layout code: a.) gtkextendedlayout.c --> gtksizerequest.c b.) _is_height_for_width --> get_request_mode() c.) get_desired_size(), get_desired_width(), get_desired_height() --> get_size(), get_width(), get_height() This is the first partial commit and only effects portions of the tree that have already been merged in master (in order to easily cherry pick this commit). Conflicts: gtk/Makefile.am gtk/gtk.h gtk/gtk.symbols gtk/gtkextendedlayout.h
2010-06-18 04:11:26 +00:00
if (minimum_size)
{
minimum_size->height = min_height;
Move GtkSizeRequest into GtkWidget It doesn't make sense to keep them separate as GtkSizeRequest requires a GtkWidget and GtkWidget implements GtkSizeRequest, so you can never have one without the other. It also makes the code a lot easier because no casts are required when calling functions. Also, the names would translate to gtk_widget_get_width() and people agreed that this would be a too generic name, so a "preferred" was added to the names. So this patch moves the functions: gtk_size_request_get_request_mode() => gtk_widget_get_request_mode() gtk_size_request_get_width() => gtk_widget_get_preferred_width() gtk_size_request_get_height() => gtk_widget_get_preferred_height() gtk_size_request_get_size() => gtk_widget_get_preferred_size() gtk_size_request_get_width_for_height() => gtk_widget_get_preferred_width_for_height() gtk_size_request_get_height_for_width() => gtk_widget_get_preferred_height_for_width() ... and moves the corresponding vfuncs to the GtkWidgetClass. The patch also renames the implementations of the vfuncs in widgets to include the word "preferrred".
2010-09-21 14:35:17 +00:00
gtk_widget_get_preferred_width_for_height (widget, min_height,
&minimum_size->width, NULL);
Mass api change from GtkExtendedLayout --> GtkSizeRequest This commit makes a few massive changes to the extended layout code: a.) gtkextendedlayout.c --> gtksizerequest.c b.) _is_height_for_width --> get_request_mode() c.) get_desired_size(), get_desired_width(), get_desired_height() --> get_size(), get_width(), get_height() This is the first partial commit and only effects portions of the tree that have already been merged in master (in order to easily cherry pick this commit). Conflicts: gtk/Makefile.am gtk/gtk.h gtk/gtk.symbols gtk/gtkextendedlayout.h
2010-06-18 04:11:26 +00:00
}
if (natural_size)
{
natural_size->height = nat_height;
Move GtkSizeRequest into GtkWidget It doesn't make sense to keep them separate as GtkSizeRequest requires a GtkWidget and GtkWidget implements GtkSizeRequest, so you can never have one without the other. It also makes the code a lot easier because no casts are required when calling functions. Also, the names would translate to gtk_widget_get_width() and people agreed that this would be a too generic name, so a "preferred" was added to the names. So this patch moves the functions: gtk_size_request_get_request_mode() => gtk_widget_get_request_mode() gtk_size_request_get_width() => gtk_widget_get_preferred_width() gtk_size_request_get_height() => gtk_widget_get_preferred_height() gtk_size_request_get_size() => gtk_widget_get_preferred_size() gtk_size_request_get_width_for_height() => gtk_widget_get_preferred_width_for_height() gtk_size_request_get_height_for_width() => gtk_widget_get_preferred_height_for_width() ... and moves the corresponding vfuncs to the GtkWidgetClass. The patch also renames the implementations of the vfuncs in widgets to include the word "preferrred".
2010-09-21 14:35:17 +00:00
gtk_widget_get_preferred_width_for_height (widget, nat_height,
NULL, &natural_size->width);
Mass api change from GtkExtendedLayout --> GtkSizeRequest This commit makes a few massive changes to the extended layout code: a.) gtkextendedlayout.c --> gtksizerequest.c b.) _is_height_for_width --> get_request_mode() c.) get_desired_size(), get_desired_width(), get_desired_height() --> get_size(), get_width(), get_height() This is the first partial commit and only effects portions of the tree that have already been merged in master (in order to easily cherry pick this commit). Conflicts: gtk/Makefile.am gtk/gtk.h gtk/gtk.symbols gtk/gtkextendedlayout.h
2010-06-18 04:11:26 +00:00
}
Mega commit to change ->get_desired_size() for ->get_desired_width/height(). This commit changes gtk_extended_layout_get_desired_size() for per dimension variants. Furthermore this commit reverts the actions done in size-groups for now as it needs a different approach. The natural width/height parameters added to aux_info have been changed for a per width cache for heights and a per height cache for widths. gtk-demo is still working, currently sizegroups are not taken into account as mentioned above - size groups need to be alerted both when the widths and heights are updated independantly and then that information needs to repropagate also to other extended layout implementors.
2010-04-13 02:21:46 +00:00
}
}
Added gtk_distribute_allocation() Added a convenience api for containers to use when allocating children (used to distribute space evenly to children).
2010-08-05 16:45:48 +00:00
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
/**
* gtk_widget_get_preferred_size:
* @widget: a #GtkWidget instance
* @minimum_size: (out) (allow-none): location for storing the minimum size, or %NULL
* @natural_size: (out) (allow-none): location for storing the natural size, or %NULL
*
* Retrieves the minimum and natural size of a widget, taking
docs: use proper apostrophe https://wiki.gnome.org/Design/OS/Typography
2014-02-07 18:01:26 +00:00
* into account the widget’s preference for height-for-width management.
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
*
* This is used to retrieve a suitable size by container widgets which do
* not impose any restrictions on the child placement. It can be used
* to deduce toplevel window and menu sizes as well as child widgets in
* free-form containers such as GtkLayout.
*
Docs: Don't use note elements In most cases, the text itself makes the message clear enough.
2014-02-02 06:22:14 +00:00
* Handle with care. Note that the natural height of a height-for-width
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
* widget will generally be a smaller size than the minimum height, since the required
* height for the natural width is generally smaller than the required height for
Docs: Don't use note elements In most cases, the text itself makes the message clear enough.
2014-02-02 06:22:14 +00:00
* the minimum width.
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
*
docs: fix name of function to use for baseline alignment
2014-01-21 21:16:08 +00:00
* Use gtk_widget_get_preferred_height_and_baseline_for_width() if you want to support
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
* baseline alignment.
*
* Since: 3.0
*/
void
gtk_widget_get_preferred_size (GtkWidget *widget,
GtkRequisition *minimum_size,
GtkRequisition *natural_size)
{
API: Don't export gtk_widget_preferred_size_and_baseline() gtk_widget_preferred_size() is only useful if you want to quickly port a widget from GTK2 sizing code to GTK3 but does not properly work with height-for-width as used in GTK. So we don't want to encourage people to use it. In particular we want people to convert to height-for-width before adding baseline support to their widgets.
2013-05-11 12:29:29 +00:00
_gtk_widget_get_preferred_size_and_baseline (widget, minimum_size, natural_size,
NULL, NULL);
Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.
2013-03-05 13:54:03 +00:00
}
Added gtk_distribute_allocation() Added a convenience api for containers to use when allocating children (used to distribute space evenly to children).
2010-08-05 16:45:48 +00:00
static gint
compare_gap (gconstpointer p1,
gconstpointer p2,
gpointer data)
{
GtkRequestedSize *sizes = data;
const guint *c1 = p1;
const guint *c2 = p2;
const gint d1 = MAX (sizes[*c1].natural_size -
sizes[*c1].minimum_size,
0);
const gint d2 = MAX (sizes[*c2].natural_size -
sizes[*c2].minimum_size,
0);
gint delta = (d2 - d1);
if (0 == delta)
delta = (*c2 - *c1);
return delta;
}
/**
GtkWidget/GtkContainer: Slight fixes to geometry-management docs. Replace it's with its in several places. Replace some , with . Replace some ; with . Fix some plurals. Other minor corrections.
2010-11-04 15:30:48 +00:00
* gtk_distribute_natural_allocation:
Added gtk_distribute_allocation() Added a convenience api for containers to use when allocating children (used to distribute space evenly to children).
2010-08-05 16:45:48 +00:00
* @extra_space: Extra space to redistribute among children after subtracting
* minimum sizes and any child padding from the overall allocation
* @n_requested_sizes: Number of requests to fit into the allocation
* @sizes: An array of structs with a client pointer and a minimum/natural size
* in the orientation of the allocation.
*
GtkWidget/GtkContainer: Slight fixes to geometry-management docs. Replace it's with its in several places. Replace some , with . Replace some ; with . Fix some plurals. Other minor corrections.
2010-11-04 15:30:48 +00:00
* Distributes @extra_space to child @sizes by bringing smaller
Added gtk_distribute_allocation() Added a convenience api for containers to use when allocating children (used to distribute space evenly to children).
2010-08-05 16:45:48 +00:00
* children up to natural size first.
*
* The remaining space will be added to the @minimum_size member of the
* GtkRequestedSize struct. If all sizes reach their natural size then
* the remaining space is returned.
*
* Returns: The remainder of @extra_space after redistributing space
* to @sizes.
*/
GtkWidget/GtkContainer: Slight fixes to geometry-management docs. Replace it's with its in several places. Replace some , with . Replace some ; with . Fix some plurals. Other minor corrections.
2010-11-04 15:30:48 +00:00
gint
Added gtk_distribute_allocation() Added a convenience api for containers to use when allocating children (used to distribute space evenly to children).
2010-08-05 16:45:48 +00:00
gtk_distribute_natural_allocation (gint extra_space,
guint n_requested_sizes,
GtkRequestedSize *sizes)
{
Fixed gtk_distribute_natural_allocation() to place the g_newa *after* g_return_if_fail() guards.
2010-09-22 04:57:35 +00:00
guint *spreading;
Added gtk_distribute_allocation() Added a convenience api for containers to use when allocating children (used to distribute space evenly to children).
2010-08-05 16:45:48 +00:00
gint i;
Added return_if_fail guard to gtk_distribute_natural_allocation()
2010-08-18 23:31:53 +00:00
g_return_val_if_fail (extra_space >= 0, 0);
Fixed gtk_distribute_natural_allocation() to place the g_newa *after* g_return_if_fail() guards.
2010-09-22 04:57:35 +00:00
spreading = g_newa (guint, n_requested_sizes);
Added gtk_distribute_allocation() Added a convenience api for containers to use when allocating children (used to distribute space evenly to children).
2010-08-05 16:45:48 +00:00
for (i = 0; i < n_requested_sizes; i++)
spreading[i] = i;
/* Distribute the container's extra space c_gap. We want to assign
* this space such that the sum of extra space assigned to children
* (c^i_gap) is equal to c_cap. The case that there's not enough
* space for all children to take their natural size needs some
* attention. The goals we want to achieve are:
*
* a) Maximize number of children taking their natural size.
* b) The allocated size of children should be a continuous
* function of c_gap. That is, increasing the container size by
* one pixel should never make drastic changes in the distribution.
* c) If child i takes its natural size and child j doesn't,
* child j should have received at least as much gap as child i.
*
* The following code distributes the additional space by following
* these rules.
*/
GtkWidget/GtkContainer: Slight fixes to geometry-management docs. Replace it's with its in several places. Replace some , with . Replace some ; with . Fix some plurals. Other minor corrections.
2010-11-04 15:30:48 +00:00
Added gtk_distribute_allocation() Added a convenience api for containers to use when allocating children (used to distribute space evenly to children).
2010-08-05 16:45:48 +00:00
/* Sort descending by gap and position. */
g_qsort_with_data (spreading,
n_requested_sizes, sizeof (guint),
compare_gap, sizes);
GtkWidget/GtkContainer: Slight fixes to geometry-management docs. Replace it's with its in several places. Replace some , with . Replace some ; with . Fix some plurals. Other minor corrections.
2010-11-04 15:30:48 +00:00
Added gtk_distribute_allocation() Added a convenience api for containers to use when allocating children (used to distribute space evenly to children).
2010-08-05 16:45:48 +00:00
/* Distribute available space.
* This master piece of a loop was conceived by Behdad Esfahbod.
*/
for (i = n_requested_sizes - 1; extra_space > 0 && i >= 0; --i)
{
/* Divide remaining space by number of remaining children.
* Sort order and reducing remaining space by assigned space
* ensures that space is distributed equally.
*/
gint glue = (extra_space + i) / (i + 1);
gint gap = sizes[(spreading[i])].natural_size
- sizes[(spreading[i])].minimum_size;
GtkWidget/GtkContainer: Slight fixes to geometry-management docs. Replace it's with its in several places. Replace some , with . Replace some ; with . Fix some plurals. Other minor corrections.
2010-11-04 15:30:48 +00:00
Added gtk_distribute_allocation() Added a convenience api for containers to use when allocating children (used to distribute space evenly to children).
2010-08-05 16:45:48 +00:00
gint extra = MIN (glue, gap);
GtkWidget/GtkContainer: Slight fixes to geometry-management docs. Replace it's with its in several places. Replace some , with . Replace some ; with . Fix some plurals. Other minor corrections.
2010-11-04 15:30:48 +00:00
Added gtk_distribute_allocation() Added a convenience api for containers to use when allocating children (used to distribute space evenly to children).
2010-08-05 16:45:48 +00:00
sizes[spreading[i]].minimum_size += extra;
GtkWidget/GtkContainer: Slight fixes to geometry-management docs. Replace it's with its in several places. Replace some , with . Replace some ; with . Fix some plurals. Other minor corrections.
2010-11-04 15:30:48 +00:00
Added gtk_distribute_allocation() Added a convenience api for containers to use when allocating children (used to distribute space evenly to children).
2010-08-05 16:45:48 +00:00
extra_space -= extra;
}
return extra_space;
}
sizerequest: Split out a common function
2013-04-22 21:37:05 +00:00
void
_gtk_widget_get_preferred_size_for_size (GtkWidget *widget,
GtkOrientation orientation,
gint size,
gint *minimum,
widget: Adapt _gtk_widget_get_preferred_size_for_size() ... for baseline support byu taking two extra (possible NULL) arguments.
2013-04-27 21:16:11 +00:00
gint *natural,
gint *minimum_baseline,
gint *natural_baseline)
sizerequest: Split out a common function
2013-04-22 21:37:05 +00:00
{
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (size >= -1);
if (orientation == GTK_ORIENTATION_HORIZONTAL)
widget: Adapt _gtk_widget_get_preferred_size_for_size() ... for baseline support byu taking two extra (possible NULL) arguments.
2013-04-27 21:16:11 +00:00
{
if (size < 0)
gtk_widget_get_preferred_width (widget, minimum, natural);
else
gtk_widget_get_preferred_width_for_height (widget, size, minimum, natural);
if (minimum_baseline)
*minimum_baseline = -1;
if (natural_baseline)
*natural_baseline = -1;
}
sizerequest: Split out a common function
2013-04-22 21:37:05 +00:00
else
widget: Adapt _gtk_widget_get_preferred_size_for_size() ... for baseline support byu taking two extra (possible NULL) arguments.
2013-04-27 21:16:11 +00:00
{
gtk_widget_get_preferred_height_and_baseline_for_width (widget,
size,
minimum,
natural,
minimum_baseline,
natural_baseline);
}
sizerequest: Split out a common function
2013-04-22 21:37:05 +00:00
}
Reference in New Issue Copy Permalink