* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
+
#include "gtkcombobox.h"
+
+#include "gtkadjustment.h"
#include "gtkcellareabox.h"
#include "gtktreemenu.h"
#include "gtkarrow.h"
#include "gtktogglebutton.h"
#include "gtktreeselection.h"
#include "gtkseparator.h"
+#include "gtkwidgetpath.h"
+#include "gtkwidgetprivate.h"
#include "gtkwindow.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h"
container_class->remove = gtk_combo_box_remove;
container_class->get_path_for_child = gtk_combo_box_get_path_for_child;
+ gtk_container_class_handle_border_width (container_class);
+
widget_class = (GtkWidgetClass *)klass;
widget_class->size_allocate = gtk_combo_box_size_allocate;
widget_class->draw = gtk_combo_box_draw;
gtk_widget_queue_draw (widget);
}
+static void
+gtk_combo_box_invalidate_order_foreach (GtkWidget *widget)
+{
+ _gtk_widget_invalidate_style_context (widget, GTK_CSS_CHANGE_POSITION | GTK_CSS_CHANGE_SIBLING_POSITION);
+}
+
static void
gtk_combo_box_invalidate_order (GtkComboBox *combo_box)
{
gtk_container_forall (GTK_CONTAINER (combo_box),
- (GtkCallback) gtk_widget_reset_style,
+ (GtkCallback) gtk_combo_box_invalidate_order_foreach,
NULL);
}
GtkWidgetPath *sibling_path;
int pos;
- path = gtk_widget_path_copy (gtk_widget_get_path (GTK_WIDGET (container)));
+ path = _gtk_widget_create_path (GTK_WIDGET (container));
if (gtk_widget_get_visible (child))
{
gdk_window_get_root_coords (gtk_widget_get_window (child),
sx, sy, &sx, &sy);
get_widget_padding_and_border (GTK_WIDGET (combo_box), &padding);
- sx -= padding.left;
+
+ if (gtk_widget_get_direction (GTK_WIDGET (combo_box)) == GTK_TEXT_DIR_RTL)
+ sx += padding.left;
+ else
+ sx -= padding.left;
if (combo_box->priv->popup_fixed_width)
gtk_widget_get_preferred_size (GTK_WIDGET (menu), &req, NULL);
&req, NULL); \
\
if (is_rtl) \
- button_allocation.x = allocation->x + padding.left; \
+ button_allocation.x = allocation->x; \
else \
button_allocation.x = allocation->x + allocation->width \
- - req.width - padding.right; \
+ - req.width; \
\
- button_allocation.y = allocation->y + padding.top; \
+ button_allocation.y = allocation->y; \
button_allocation.width = MAX (1, req.width); \
- button_allocation.height = allocation->height - \
- (padding.top + padding.bottom); \
+ button_allocation.height = allocation->height; \
button_allocation.height = MAX (1, button_allocation.height); \
\
gtk_widget_size_allocate (combo_box->priv->button, \
child_widget = gtk_bin_get_child (GTK_BIN (widget));
get_widget_padding_and_border (widget, &padding);
+ allocation->x += padding.left;
+ allocation->y += padding.top;
+ allocation->width -= padding.left + padding.right;
+ allocation->height -= padding.top + padding.bottom;
+
if (!priv->tree_view)
{
if (priv->cell_view)
* Allocate the button to the full combobox allocation (minus the
* padding).
*/
- allocation->x += padding.left;
- allocation->y += padding.top;
- allocation->width -= padding.left + padding.right;
- allocation->height -= padding.top + padding.bottom;
gtk_widget_size_allocate (priv->button, allocation);
child.x = allocation->x;
{
child.x += req.width;
child.width = allocation->x + allocation->width
- - border_width - child.x;
+ - border_width - child.x - button_padding.right;
}
else
{
if (is_rtl)
child.x = button_allocation.x + button_allocation.width;
else
- child.x = allocation->x + padding.left;
+ child.x = allocation->x;
- child.y = allocation->y + padding.top;
- child.width = allocation->width - button_allocation.width - (padding.left + padding.right);
+ child.y = allocation->y;
+ child.width = allocation->width - button_allocation.width;
child.height = button_allocation.height;
child.width = MAX (1, child.width);
/* list mode; child_widget might be either priv->cell_view or a child
* added with gtk_container_add().
*/
- guint border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
/* After the macro, button_allocation has the button allocation rect */
GTK_COMBO_BOX_SIZE_ALLOCATE_BUTTON
child.x = allocation->x;
child.y = allocation->y;
- child.width = allocation->width - button_allocation.width - (padding.left + padding.right);
+ child.width = allocation->width - button_allocation.width;
child.height = button_allocation.height;
if (priv->cell_view_frame)
{
- child.x += padding.left + border_width;
- child.y += padding.top + border_width;
- child.width = MAX (1, child.width - (2 * border_width) - (padding.left + padding.right));
- child.height = MAX (1, child.height - (2 * border_width) - (padding.top + padding.bottom));
gtk_widget_size_allocate (priv->cell_view_frame, &child);
/* restrict allocation of the child into the frame box if it's present */
if (priv->has_frame)
{
GtkBorder frame_padding;
+ guint border_width;
border_width = gtk_container_get_border_width (GTK_CONTAINER (priv->cell_view_frame));
get_widget_padding_and_border (priv->cell_view_frame, &frame_padding);
child.height -= (2 * border_width) + frame_padding.top + frame_padding.bottom;
}
}
- else
- {
- child.x += padding.left + border_width;
- child.y += padding.top + border_width;
- child.width -= (2 * border_width) - (padding.left + padding.right);
- child.height -= (2 * border_width) - (padding.top + padding.bottom);
- }
if (gtk_widget_get_visible (priv->popup_window))
{
priv->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
gtk_container_add (GTK_CONTAINER (priv->box), priv->arrow);
+ gtk_widget_add_events (priv->button, GDK_SCROLL_MASK);
gtk_widget_show_all (priv->button);
}
priv->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
gtk_container_add (GTK_CONTAINER (priv->button), priv->arrow);
+ gtk_widget_add_events (priv->button, GDK_SCROLL_MASK);
gtk_widget_show_all (priv->button);
}
gint font_size, arrow_size;
PangoContext *context;
PangoFontMetrics *metrics;
- const PangoFontDescription *font_desc;
GtkWidget *child;
gint minimum_width = 0, natural_width = 0;
gint child_min, child_nat;
- GtkStyleContext *style_context;
- GtkStateFlags state;
GtkBorder padding;
gfloat arrow_scaling;
"arrow-scaling", &arrow_scaling,
NULL);
- style_context = gtk_widget_get_style_context (widget);
- state = gtk_widget_get_state_flags (widget);
-
get_widget_padding_and_border (widget, &padding);
- font_desc = gtk_style_context_get_font (style_context, state);
context = gtk_widget_get_pango_context (GTK_WIDGET (widget));
- metrics = pango_context_get_metrics (context, font_desc,
+ metrics = pango_context_get_metrics (context,
+ pango_context_get_font_description (context),
pango_context_get_language (context));
font_size = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) +
pango_font_metrics_get_descent (metrics));
/* menu mode */
if (priv->cell_view)
{
- gint box_width;
- gint border_width, xpad;
+ gint box_width, xpad;
GtkBorder button_padding;
- border_width = gtk_container_get_border_width (GTK_CONTAINER (combo_box));
get_widget_padding_and_border (priv->button, &button_padding);
gtk_widget_get_preferred_width (priv->box, &box_width, NULL);
- xpad = 2 * border_width +
- button_padding.left + button_padding.right + padding.left + padding.right;
+ xpad = button_padding.left + button_padding.right + padding.left + padding.right;
minimum_width = child_min + box_width + xpad;
natural_width = child_nat + box_width + xpad;
{
/* calculate x/y padding and separator/arrow size */
gint box_width, box_height;
- gint border_width, xpad, ypad;
+ gint xpad, ypad;
GtkBorder button_padding;
- border_width = gtk_container_get_border_width (GTK_CONTAINER (combo_box));
get_widget_padding_and_border (priv->button, &button_padding);
gtk_widget_get_preferred_width (priv->box, &box_width, NULL);
gtk_widget_get_preferred_height_for_width (priv->box,
box_width, &box_height, NULL);
- xpad = 2 * border_width +
- button_padding.left + button_padding.right;
- ypad = 2 * border_width +
- button_padding.top + button_padding.bottom;
+ xpad = button_padding.left + button_padding.right;
+ ypad = button_padding.top + button_padding.bottom;
size -= box_width + xpad;
projects / ~andy / gtk / blobdiff