From b0223fd7292193005327b113a69ad4f57796ca34 Mon Sep 17 00:00:00 2001
From: michael <michael@72102866-910b-0410-8b05-ffd578937521>
Date: Sat, 31 Jul 1999 00:44:25 +0000
Subject: [PATCH] Fixes for nspopupbutton

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4678 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                              |   5 +++
 Images/GNUmakefile                     |   2 ++
 Images/common_DownArrowSmall.tiff      | Bin 0 -> 408 bytes
 Images/common_UpAndDownArrowSmall.tiff | Bin 0 -> 436 bytes
 Source/NSPopUpButtonCell.m             |  48 +++++++++++++++++--------
 5 files changed, 41 insertions(+), 14 deletions(-)
 create mode 100644 Images/common_DownArrowSmall.tiff
 create mode 100644 Images/common_UpAndDownArrowSmall.tiff

diff --git a/ChangeLog b/ChangeLog
index 635313cb8..199b9a61a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,12 +10,17 @@
 	popupbuttons.app in core/Testing to see.
 	* Source/NSPopUpButtonCell.m: modifications to make NSPopUpButton
 	work. Also implemented representedObject as I think it should be.
+	Also made popupbutton arrow image work for popups that use images.
 	* Source/NSTableColumn.m: fixes to make some things work a little
 	better.
 	* Source/NSTableView.m: fixes to make things behave. Still doesn't
 	compile in, but it is getting there. Modifications will have to
 	be made to NSScrollView before we can use this class.
 	* Source/NSTabView.m: fixed (- contentRect) for the no tabs case.
+
+	* Images/: added common_UpAndDownArrowSmall.tiff and
+	common_DownArrowSmall.tiff for popupbuttons with images in them.
+
 	* Headers/NSMenu.h: mods for changes.
 	* Headers/NSPopUpButton.h: ditto.
 	* Headers/NSPopUpButtonCell.h: ditto, also changed to inherit from
diff --git a/Images/GNUmakefile b/Images/GNUmakefile
index 3bc3d0e69..673a71b79 100644
--- a/Images/GNUmakefile
+++ b/Images/GNUmakefile
@@ -73,6 +73,8 @@ common_TabUnSelectedJunction.tiff \
 common_TabUnSelectedLeft.tiff \
 common_TabUnSelectedRight.tiff \
 common_Tile.tiff \
+common_UpAndDownArrowSmall.tiff \
+common_DownArrowSmall.tiff \
 common_Nibble.tiff \
 common_Dimple.tiff \
 common_ret.tiff \
diff --git a/Images/common_DownArrowSmall.tiff b/Images/common_DownArrowSmall.tiff
new file mode 100644
index 0000000000000000000000000000000000000000..0c3377caf73d4773de64d7968be5da588856e3e5
GIT binary patch
literal 408
zcmebD)M7AVU|?WmVEH7kk+I=H<KK2B3ATg|hY)2pPARRD8yz8kSNF;4)r9;{e9Xqh
z!5|D&%nVe|z`zR92W7JW*-St-h?W6LG9#&BgR+@`a$HDkUPdMcU!a%@P(2@zEe2#4
z0oj6#EMW6FfP5jSdXRmhP&UX8F(`W`P(mE4UK1!T#mEZQ+W{1phO#FB*)mAxXh7K@
z_t+w_gOJn!r5HG%P`|XeNIxS#H&s73GdUwMHAg=<F)t-4ze3;LFSNKMwLm{PzbI8d
zy);wbGdD3kwHV0H&CSn?cgZi$b1W*#FAvU5%*oL!$xKUQU~n!<O)N=GQ7F$W$xsN%
TNL6t6^bG)6=K;hZZ-Qw6@ZdS5

literal 0
HcmV?d00001

diff --git a/Images/common_UpAndDownArrowSmall.tiff b/Images/common_UpAndDownArrowSmall.tiff
new file mode 100644
index 0000000000000000000000000000000000000000..faa574bf20a9f1fc987f8e7da72342397abd8fbb
GIT binary patch
literal 436
zcmebD)MD^rU|?WmVBwNEQE%{{!I_CiNTs49AVm3BxGZbJj(~-SS-L!~)<3A&D5T~!
zN5gT_hJ(o}U6XknzHm%jw4zT^yY_?vBO`+_&=6*zISdS}AoHMXP9U2J$Yuf3CO}DM
zBsFYMHWN^e3yICk$ixr?6te-U=L53Efb2dXTab|jY(58&F9cN&vQHGs2H7D7WzPgk
zh(pyo0>z~mS;2aj0L7)D>@`5P43aq-P&UXtwn*$CBsD-O1`a6HFD)+8&&bbB)z8gL
z&PYtn(GO0{OG(PF(0BI>EiOqd&`-`UO4Uy<&D8hIO-xTM2J&-r^Yh|E3mo%OT=L8F
y9E*zb%Y$<hb8_@bGSku+oQqNuOHxx5$}>wc6hbmm72G|213*@K05Q<D5E=jie?<fU

literal 0
HcmV?d00001

diff --git a/Source/NSPopUpButtonCell.m b/Source/NSPopUpButtonCell.m
index e5a587f34..5200d3cd2 100644
--- a/Source/NSPopUpButtonCell.m
+++ b/Source/NSPopUpButtonCell.m
@@ -82,26 +82,32 @@
   if (cell_image)
     {
       [self _drawImage:cell_image inFrame:cellFrame];
-      return;
+
+      rect.size.width = 5;                         // calc image rect
+      rect.size.height = 11;
+      rect.origin.x = cellFrame.origin.x + cellFrame.size.width - 8;
+      rect.origin.y = cellFrame.origin.y + 3;
     }
+  else
+    {
+      [cell_font set];
 
-  [cell_font set];
+      point.y = rect.origin.y + (rect.size.height/2) - 4;
+      point.x = rect.origin.x + xDist;
+      rect.origin = point;  
 
-  point.y = rect.origin.y + (rect.size.height/2) - 4;
-  point.x = rect.origin.x + xDist;
-  rect.origin = point;  
-
-  [[NSColor blackColor] set];
+      [[NSColor blackColor] set];
   
-  // Draw the title.
+      // Draw the title.
 
-  DPSmoveto(ctxt, rect.origin.x, rect.origin.y);
-  DPSshow(ctxt, [contents cString]);
+      DPSmoveto(ctxt, rect.origin.x, rect.origin.y);
+      DPSshow(ctxt, [contents cString]);
 
-  rect.size.width = 15;                         // calc image rect
-  rect.size.height = cellFrame.size.height;
-  rect.origin.x = cellFrame.origin.x + cellFrame.size.width - (6 + 11);
-  rect.origin.y = cellFrame.origin.y;
+      rect.size.width = 15;                         // calc image rect
+      rect.size.height = cellFrame.size.height;
+      rect.origin.x = cellFrame.origin.x + cellFrame.size.width - (6 + 11);
+      rect.origin.y = cellFrame.origin.y;
+    }
 
   if ([view isKindOfClass:[NSMenuView class]])
     {
@@ -114,6 +120,13 @@
           else
             [super _drawImage:[NSImage imageNamed:@"common_3DArrowDown"] inFrame:rect];
 	}
+      else if ([[[popb selectedItem] representedObject] isEqual: cell_image])
+        {
+          if ([popb pullsDown] == NO)
+            [super _drawImage:[NSImage imageNamed:@"common_UpAndDownArrowSmall.tiff"] inFrame:rect];
+          else
+            [super _drawImage:[NSImage imageNamed:@"common_DownArrowSmall"] inFrame:rect];
+	}
     }
   else if ([view isKindOfClass:[NSPopUpButton class]])
     {
@@ -125,6 +138,13 @@
           else
             [super _drawImage:[NSImage imageNamed:@"common_3DArrowDown"] inFrame:rect];
 	}
+      else if ([[[(NSPopUpButton *)view selectedItem] representedObject] isEqual: cell_image])
+        {
+          if ([(NSPopUpButton *)view pullsDown] == NO)
+            [super _drawImage:[NSImage imageNamed:@"common_UpAndDownArrowSmall"] inFrame:rect];
+          else
+            [super _drawImage:[NSImage imageNamed:@"common_DownArrowSmall"] inFrame:rect];
+	}
     }
 }
 @end