From a93a1e4f8ac1f1257aef9acbd4c922497914c31d Mon Sep 17 00:00:00 2001
From: michael <michael@72102866-910b-0410-8b05-ffd578937521>
Date: Mon, 21 Jun 1999 04:38:35 +0000
Subject: [PATCH] Fixes.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4445 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                           |   1 +
 Headers/gnustep/gui/NSPopUpButton.h |   1 +
 Images/GNUmakefile                  |   1 +
 Images/common_3DArrowDown.tiff      | Bin 0 -> 422 bytes
 Source/NSPopUpButton.m              |  16 +++++++++++++++-
 Source/NSPopUpButtonCell.m          |   5 ++++-
 6 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 Images/common_3DArrowDown.tiff

diff --git a/ChangeLog b/ChangeLog
index b2444a2dc..efac29c36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
 	common_TabUnSelectedJunction.tiff
 	common_TabUnSelectedLeft.tiff
 	common_TabUnSelectedRight.tiff: all tiffs needed to draw NSTabs.
+	* Images/common_3DArrowDown.tiff: for NSPopUp in pulldown mode.
 	* Source/NSTabView.m: lots of work on drawing. Should draw correct
 	in almost all cases. However, without event code I can't test it
 	yet.
diff --git a/Headers/gnustep/gui/NSPopUpButton.h b/Headers/gnustep/gui/NSPopUpButton.h
index 5be47ef66..64617e638 100644
--- a/Headers/gnustep/gui/NSPopUpButton.h
+++ b/Headers/gnustep/gui/NSPopUpButton.h
@@ -43,6 +43,7 @@
 
 @interface NSPopUpButtonMatrix : NSMenuMatrix
 {
+  BOOL pull_down;
   int selected_cell;
   NSPopUpButton *popup_button;
 }
diff --git a/Images/GNUmakefile b/Images/GNUmakefile
index eb64876a3..ca3dda1c1 100644
--- a/Images/GNUmakefile
+++ b/Images/GNUmakefile
@@ -33,6 +33,7 @@ imagedir = $(GNUSTEP_RESOURCES)/Images
 
 IMAGE_FILES = \
 GNUstep_Images_Copyright \
+common_3DArrowDown.tiff \
 common_ArrowDown.tiff \
 common_ArrowUp.tiff \
 common_ArrowRight.tiff \
diff --git a/Images/common_3DArrowDown.tiff b/Images/common_3DArrowDown.tiff
new file mode 100644
index 0000000000000000000000000000000000000000..291c3b35ddac393ef607faaa8446a9a852e3d367
GIT binary patch
literal 422
zcmebD)MD^qU|?WmVEH7kk+I={V$)ClxAF-V4T{Q43#3#%E*K;pcJFbzy8qP=!A0$y
z^9@|)RB$RC^O$6_@70otLGAvtje<IS9xAc1FbD&UVFsGSz`zbN5sA$NWU~Op%z%>2
zP;piupAE`p0<yV~*u0EP3{F5XJD_?#AX^N`ZUC|c8Ck&Qa{&25Q1u}DM4@bu9b!<n
z3Q$5Es@@qWF2%?S);kR-E)8YR1F~h1%+Y|dLGH0dVh16q0ZK7&K%stVaglyTer~FM
zZf0^uVrq_laAICcQhtSga(+>&etK!9zGrS?dTKF{pPQSX7jNw1SX7i>?vh`gr&p4h
kmd4;*l$uzQnxasiS(2d;l98(5?&%u<vcdz1L0$vX0GqEt+5i9m

literal 0
HcmV?d00001

diff --git a/Source/NSPopUpButton.m b/Source/NSPopUpButton.m
index f5681c196..28fa73c59 100644
--- a/Source/NSPopUpButton.m
+++ b/Source/NSPopUpButton.m
@@ -82,6 +82,16 @@
 {
   ASSIGN(popup_button, popb);
 }
+
+- (void)setPullsDown:(BOOL)pull
+{
+  pull_down = pull;
+}
+
+- (BOOL)pullsDown
+{
+  return pull_down;
+}
 @end
 
 //
@@ -121,6 +131,7 @@
   [super initWithFrame:frameRect];
   list_items = [[NSPopUpButtonMatrix alloc] initWithFrame:frameRect];
   [list_items setPopUpButton:self];
+  [list_items setPullsDown:flag];
   is_up = NO;
   pulls_down = flag;
   selected_item = 0;
@@ -159,7 +170,10 @@
 
 - (void)buttonSelected:(id)sender
 {
-  selected_item = [self indexOfItemWithTitle:[sender title]];
+  if (!pulls_down)
+    selected_item = [self indexOfItemWithTitle:[sender title]];
+  else
+    selected_item = 0;
 
   [self synchronizeTitleAndSelectedItem];
 
diff --git a/Source/NSPopUpButtonCell.m b/Source/NSPopUpButtonCell.m
index 49a39ed4e..80757597b 100644
--- a/Source/NSPopUpButtonCell.m
+++ b/Source/NSPopUpButtonCell.m
@@ -62,7 +62,10 @@
   
   if ([(NSPopUpButton *)view titleOfSelectedItem] == contents)
   {
-    [super _drawImage:[NSImage imageNamed:@"common_Nibble"] inFrame:rect];
+    if ([(NSPopUpButton *)view pullsDown] == NO)
+      [super _drawImage:[NSImage imageNamed:@"common_Nibble"] inFrame:rect];
+    else
+      [super _drawImage:[NSImage imageNamed:@"common_3DArrowDown"] inFrame:rect];
   }
 }
 @end