comparison src/xdisp.c @ 31650:8b3846ae64fe

(build_desired_tool_bar_string): For a toolbar item in disabled state, don't apply an image transformation algorithm if the user specified an image for the disabled state. Use `:algorthm disabled' for creating a disabled item's image if the user hasn't specified an image.

31649:fe990a5df9d3

      (XVECTOR (f->desired_tool_bar_items)		\
       ->contents[i * TOOL_BAR_ITEM_NSLOTS + (IDX)])

      int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P));
      int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P));
      int margin, relief;
      extern Lisp_Object QCrelief, QCmargin, QCalgorithm, Qimage;
      extern Lisp_Object Qlaplace;

      /* If image is a vector, choose the image according to the
	 button state.  */
      image = PROP (TOOL_BAR_ITEM_IMAGES);
      if (VECTORP (image))
	{
	  enum tool_bar_item_image idx;
	  
	  if (enabled_p)
	    idx = (selected_p
		   ? TOOL_BAR_IMAGE_ENABLED_SELECTED
		   : TOOL_BAR_IMAGE_ENABLED_DESELECTED);
	  else
	    idx = (selected_p
		   ? TOOL_BAR_IMAGE_DISABLED_SELECTED
		   : TOOL_BAR_IMAGE_DISABLED_DESELECTED);
	  
	  xassert (XVECTOR (image)->size >= idx);
	  image = XVECTOR (image)->contents[idx];
	}

      /* Ignore invalid image specifications.  */
      if (!valid_image_p (image))
	continue;

      /* Put a margin around the image.  */
      if (margin)
	plist = Fplist_put (plist, QCmargin, make_number (margin));
	  
      /* If button is not enabled, make the image appear disabled by
	 applying an appropriate algorithm to it.  */
      if (!enabled_p)
	plist = Fplist_put (plist, QCalgorithm, Qlaplace);
      
      /* Put a `display' text property on the string for the image to
	 display.  Put a `menu-item' property on the string that gives
	 the start of this item's properties in the tool-bar items
	 vector.  */

31650:8b3846ae64fe

      (XVECTOR (f->desired_tool_bar_items)		\
       ->contents[i * TOOL_BAR_ITEM_NSLOTS + (IDX)])

      int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P));
      int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P));
      int margin, relief, idx;
      extern Lisp_Object QCrelief, QCmargin, QCalgorithm, Qimage;
      extern Lisp_Object Qlaplace;

      /* If image is a vector, choose the image according to the
	 button state.  */
      image = PROP (TOOL_BAR_ITEM_IMAGES);
      if (VECTORP (image))
	{
	  if (enabled_p)
	    idx = (selected_p
		   ? TOOL_BAR_IMAGE_ENABLED_SELECTED
		   : TOOL_BAR_IMAGE_ENABLED_DESELECTED);
	  else
	    idx = (selected_p
		   ? TOOL_BAR_IMAGE_DISABLED_SELECTED
		   : TOOL_BAR_IMAGE_DISABLED_DESELECTED);
	  
	  xassert (ASIZE (image) >= idx);
	  image = AREF (image, idx);
	}
      else
	idx = -1;

      /* Ignore invalid image specifications.  */
      if (!valid_image_p (image))
	continue;

      /* Put a margin around the image.  */
      if (margin)
	plist = Fplist_put (plist, QCmargin, make_number (margin));
	  
      /* If button is not enabled, and we don't have special images
	 for the disabled state, make the image appear disabled by
	 applying an appropriate algorithm to it.  */
      if (!enabled_p && idx < 0)
	plist = Fplist_put (plist, QCalgorithm, Qdisabled);
      
      /* Put a `display' text property on the string for the image to
	 display.  Put a `menu-item' property on the string that gives
	 the start of this item's properties in the tool-bar items
	 vector.  */