comparison src/gtkutil.c @ 59084:6a0b8f23858b

* gtkutil.c (update_frame_tool_bar): Make the value of tool-bar-button-margin control margins of images in tool bar.

59083:4295cf593352

  int i;
  GtkRequisition old_req, new_req;
  GList *icon_list;
  GList *iter;
  struct x_output *x = f->output_data.x;

  if (! FRAME_GTK_WIDGET (f))
    return;

  BLOCK_INPUT;

  if (! x->toolbar_widget)
    xg_create_tool_bar (f);

  gtk_widget_size_request (x->toolbar_widget, &old_req);

        }

      if (! wicon)
        {
          GtkWidget *w = xg_get_image_for_pixmap (f, img, x->widget, NULL);

          gtk_toolbar_append_item (GTK_TOOLBAR (x->toolbar_widget),
                                   0, 0, 0,
                                   w,
                                   GTK_SIGNAL_FUNC (xg_tool_bar_callback),

          GtkImage *wimage = GTK_IMAGE (chlist->data);
          Pixmap old_img = (Pixmap)g_object_get_data (G_OBJECT (wimage),
                                                      XG_TOOL_BAR_IMAGE_DATA);
          g_list_free (chlist);

          if (old_img != img->pixmap)
            (void) xg_get_image_for_pixmap (f, img, x->widget, wimage);

          g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_IMAGE_DATA,
                             (gpointer)img->pixmap);

59084:6a0b8f23858b

  int i;
  GtkRequisition old_req, new_req;
  GList *icon_list;
  GList *iter;
  struct x_output *x = f->output_data.x;
  int hmargin, vmargin;

  if (! FRAME_GTK_WIDGET (f))
    return;

  BLOCK_INPUT;

  if (INTEGERP (Vtool_bar_button_margin)
      && XINT (Vtool_bar_button_margin) > 0)
    {
      hmargin = XFASTINT (Vtool_bar_button_margin);
      vmargin = XFASTINT (Vtool_bar_button_margin);
    }
  else if (CONSP (Vtool_bar_button_margin))
    {
      if (INTEGERP (XCAR (Vtool_bar_button_margin))
          && XINT (XCAR (Vtool_bar_button_margin)) > 0)
        hmargin = XFASTINT (XCAR (Vtool_bar_button_margin));

      if (INTEGERP (XCDR (Vtool_bar_button_margin))
          && XINT (XCDR (Vtool_bar_button_margin)) > 0)
        vmargin = XFASTINT (XCDR (Vtool_bar_button_margin));
    }

  /* The natural size (i.e. when GTK uses 0 as margin) looks best,
     so take DEFAULT_TOOL_BAR_BUTTON_MARGIN to mean "default for GTK",
     i.e. zero.  This means that margins less than
     DEFAULT_TOOL_BAR_BUTTON_MARGIN has no effect.  */
  hmargin = max (0, hmargin - DEFAULT_TOOL_BAR_BUTTON_MARGIN);
  vmargin = max (0, vmargin - DEFAULT_TOOL_BAR_BUTTON_MARGIN);
  
  if (! x->toolbar_widget)
    xg_create_tool_bar (f);

  gtk_widget_size_request (x->toolbar_widget, &old_req);

        }

      if (! wicon)
        {
          GtkWidget *w = xg_get_image_for_pixmap (f, img, x->widget, NULL);

          gtk_misc_set_padding (GTK_MISC (w), hmargin, vmargin);

          gtk_toolbar_append_item (GTK_TOOLBAR (x->toolbar_widget),
                                   0, 0, 0,
                                   w,
                                   GTK_SIGNAL_FUNC (xg_tool_bar_callback),

          GtkImage *wimage = GTK_IMAGE (chlist->data);
          Pixmap old_img = (Pixmap)g_object_get_data (G_OBJECT (wimage),
                                                      XG_TOOL_BAR_IMAGE_DATA);
          g_list_free (chlist);

          gtk_misc_set_padding (GTK_MISC (wimage), hmargin, vmargin);

          if (old_img != img->pixmap)
            (void) xg_get_image_for_pixmap (f, img, x->widget, wimage);

          g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_IMAGE_DATA,
                             (gpointer)img->pixmap);