From cf5daf9dc7ff6d22dcfab785b35df1a5e7cbfd10 Mon Sep 17 00:00:00 2001 From: Jon Thysell Date: Sat, 16 Oct 2021 15:38:43 -0700 Subject: [PATCH] Cleaned up about dialog, fixed window centering --- src/GameWindow.c | 2 -- src/MacCommon.c | 5 ----- src/MacCommon.h | 4 ++-- src/MacLO.c | 3 +++ src/MacLO.pi.rsrc.bin | Bin 3712 -> 3712 bytes 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/GameWindow.c b/src/GameWindow.c index acd0212..0355174 100644 --- a/src/GameWindow.c +++ b/src/GameWindow.c @@ -18,8 +18,6 @@ void GameWindow_Init(GameWindow *pGameWindow) } GameEngine_LoadLevel(&(pGameWindow->Engine), 0, false); - - CenterWindow(pGameWindow->Window); } void GameWindow_Draw(GameWindow *pGameWindow) diff --git a/src/MacCommon.c b/src/MacCommon.c index f1a9e82..d919102 100644 --- a/src/MacCommon.c +++ b/src/MacCommon.c @@ -3,11 +3,6 @@ #include "MacCommon.h" -void CenterWindow(WindowPtr window) -{ - // TODO -} - void ShowError(Str255 message, Boolean isFatal) { ParamText(message, EmptyString, EmptyString, EmptyString); diff --git a/src/MacCommon.h b/src/MacCommon.h index 3159031..05a2bc3 100644 --- a/src/MacCommon.h +++ b/src/MacCommon.h @@ -12,8 +12,8 @@ #define ErrorAlertResID BaseResID -void CenterWindow(WindowPtr window); -Boolean IsCompactDisplay(); +pascal OSErr SetDialogDefaultItem(DialogPtr theDialog, short newItem) = { 0x303C, 0x0304, 0xAA68 }; + void ShowError(Str255 message, Boolean isFatal); #endif diff --git a/src/MacLO.c b/src/MacLO.c index bb2c920..583c44c 100644 --- a/src/MacLO.c +++ b/src/MacLO.c @@ -180,6 +180,9 @@ void MacLO_ShowAboutDialog() dialog = GetNewDialog(AboutDialogResID, nil, MoveToFront); SetPort(dialog); + + SetDialogDefaultItem(dialog, AboutDialogOKID); + ShowWindow(dialog); ModalDialog(nil, &itemHit); diff --git a/src/MacLO.pi.rsrc.bin b/src/MacLO.pi.rsrc.bin index b7a39ac125ab3859394c803e9ac5d48e247cf23b..114a30e8ef9fee2853952b0cc673852d90e54820 100644 GIT binary patch delta 472 zcmZpWZIGQ1#rg1V>oc#r6XqvR6ciV0Y%Kc100fLc%%jS{zzxKVdnQiMWxP9apDFi* zg%?1w3=F&vCo?iOZJxsz&N-QtyOFb;p@`u=V?P7qAw{Jp_yxfr|| zY#D_o`|?D%Fz_){GITK9WvpOm2o2r91ymr#puxbz7{vI8fd#A_NU-`QCj0nn0A*3# z!Cc$hAjB|vC(pEcZg%F{ZVQM8#A3?BL zPaxRrXAo=-NC3n)FsLaoaD4?jVg^G4gMtDBX9!qPBZCxBycVH>vkHmb0#O69m~#_E voIwYu_cC*BmkY$voIinPYE0JUlQL&@Ov*1UVRbDk$}fVFV3BRNbMYYn%h!Ek delta 471 zcmZpWZIGQ1#rgDZ>oc#r{TV(J1;xc08#nhc00AQq^C&Yga04;pp@|c88TU-wXUg55 zB@dEiVBmc^nUS$c2FQ|N&|qL<3}F1jzyg*560E+7$v*y@8yLem`S}%BRAOQB_Xca{V(??IWmK9h&l4en>Imlb zwJv-ilXvq>t7l+fUSE9%Vjbg2=5-Ad7#jZn2l8c@*T-#vvTc~xSDHZC?#%1!Y9MSz zZ|3z?It+{;^^E;My%|vP2SD)^5H{-*p!zuwHv0>pT@nyB#~bGL6;~MI8yJif7&r@n zoCORG3_3t|6Hw6-hDHW81qQCwK!ZXc8aP(~)pS7Fn}BKr7#cwqbAl`bTEHL$RL=-> z=nRM&E_I-T)=bvtld|M?Ov*1Uamh@~$xmkmvsqn>it>vfWNv<*UIs%k1Jm8!cX}`k Jj0<3p0RY#&j?e%A