mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 12:00:52 +00:00
2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* NSPanel.m set2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
2001-07-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* Source/NSPanel.m ([-setTitle:message:def:alt:other]): Corrected the
nextKeyView chain initialization.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@10506 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Pierre-Yves Rivaille
parent
29123801c9
commit
e1fabffcac
1 changed files with 63 additions and 15 deletions
|
|
@ -188,21 +188,21 @@ static NSString *defaultTitle = @" ";
|
|||
| | | | | |
|
||||
| ........... | | | |
|
||||
| : | : | | | |
|
||||
|--: Icon | : ----Title | | |
|
||||
| : -------|-: | | |
|
||||
| : .........: | | |
|
||||
| | |
|
||||
|- =========================== |=============~~~~~~=========================-|
|
||||
|--: Icon | :----Title | | |
|
||||
| :-------|-: | | |
|
||||
| :.........: | | |
|
||||
| | | |
|
||||
|-===========================|=============~~~~~~=========================-|
|
||||
| s | |
|
||||
| s | |
|
||||
| ...................s....|......................................... |
|
||||
| : Message s s ; |
|
||||
| :Message s s ; |
|
||||
| : s s : |
|
||||
| : s s : |
|
||||
|----: s s : ----|
|
||||
| : ~~~~~~~~~~~~~~~~~~s~~~~~~~~~~~~~~~~~~~~s~~~~~~~~~~~~~~~~~~~~~~~~: |
|
||||
|----: s s :----|
|
||||
| :~~~~~~~~~~~~~~~~~~s~~~~~~~~~~~~~~~~~~~~s~~~~~~~~~~~~~~~~~~~~~~~~: |
|
||||
| : s s : |
|
||||
| : ..................s.............................................: |
|
||||
| :..................s.............................................: |
|
||||
| | s |
|
||||
| | s +-----------+ +-----------+ +-----------+ |
|
||||
| | s | Altern |---| Cancel |---| OK |----|
|
||||
|
|
@ -234,7 +234,7 @@ static NSString *defaultTitle = @" ";
|
|||
|
||||
|
||||
Some rules (which are implemented in sizePanelToFit):
|
||||
=====================================================
|
||||
=====================================================
|
||||
|
||||
|
||||
IF the messageField is too big either vertically or horizontally and
|
||||
|
|
@ -558,11 +558,6 @@ setControl(NSView* content, id control, NSString *title)
|
|||
altButton = [self _makeButtonWithRect: rect];
|
||||
othButton = [self _makeButtonWithRect: rect];
|
||||
|
||||
/* Create the nextKeyView chain */
|
||||
[defButton setNextKeyView: othButton];
|
||||
[othButton setNextKeyView: altButton];
|
||||
[altButton setNextKeyView: defButton];
|
||||
|
||||
rect.size.height = 80.0;
|
||||
scroll = makeScrollViewWithRect(rect);
|
||||
|
||||
|
|
@ -907,6 +902,59 @@ setControl(NSView* content, id control, NSString *title)
|
|||
{
|
||||
[self makeFirstResponder: self];
|
||||
}
|
||||
|
||||
/* a *working* nextKeyView chain:
|
||||
the trick is that the 3 buttons are not always used (displayed)
|
||||
so we have to set the nextKeyView *each* time.
|
||||
Maybe some optimisation in the logic of this block will be good,
|
||||
however it seems too risky for a (so) small reward
|
||||
*/
|
||||
{
|
||||
BOOL ud, ua, uo;
|
||||
ud = useControl(defButton);
|
||||
ua = useControl(altButton);
|
||||
uo = useControl(othButton);
|
||||
|
||||
if (ud)
|
||||
{
|
||||
if (uo)
|
||||
[defButton setNextKeyView: othButton];
|
||||
else if (ua)
|
||||
[defButton setNextKeyView: altButton];
|
||||
else
|
||||
{
|
||||
[defButton setPreviousKeyView:nil];
|
||||
[defButton setNextKeyView: nil];
|
||||
}
|
||||
}
|
||||
|
||||
if (uo)
|
||||
{
|
||||
if (ua)
|
||||
[othButton setNextKeyView: altButton];
|
||||
else if (ud)
|
||||
[othButton setNextKeyView: defButton];
|
||||
else
|
||||
{
|
||||
[othButton setPreviousKeyView:nil];
|
||||
[othButton setNextKeyView: nil];
|
||||
}
|
||||
}
|
||||
|
||||
if (ua)
|
||||
{
|
||||
if (ud)
|
||||
[altButton setNextKeyView: defButton];
|
||||
else if (uo)
|
||||
[altButton setNextKeyView: othButton];
|
||||
else
|
||||
{
|
||||
[altButton setPreviousKeyView:nil];
|
||||
[altButton setNextKeyView: nil];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
isGreen = YES;
|
||||
result = NSAlertErrorReturn; /* If no button was pressed */
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue