WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 23:00:42 +00:00
Code Issues Projects Releases Wiki Activity

Finish implementing alerts

Browse Source
This commit is contained in:
elasota
2020-02-04 23:32:40 -05:00
parent dee560492e
commit 4f24439f7e
1 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
PortabilityLayer/DialogManager.cpp
View File

@@ -1,5 +1,6 @@
#include "DialogManager.h" #include "DialogManager.h"
#include "HostDisplayDriver.h" #include "HostDisplayDriver.h"
#include "HostSystemServices.h"
#include "IconLoader.h" #include "IconLoader.h"
#include "IGpDisplayDriver.h" #include "IGpDisplayDriver.h"
#include "ResourceManager.h" #include "ResourceManager.h"
@@ -451,6 +452,9 @@ namespace PortabilityLayer
private: private:
void PositionWindow(Window *window, const Rect &rect); void PositionWindow(Window *window, const Rect &rect);
Dialog *LoadDialogFromTemplate(int16_t templateResID, const Rect &rect, bool visible, bool hasCloseBox, uint32_t referenceConstant, uint16_t positionSpec, Window *behindWindow, const PLPasStr &title, const DialogTextSubstitutions *substitutions);
static int16_t AlertFilter(Dialog *dialog, const TimeTaggedVOSEvent &evt);
static DialogManagerImpl ms_instance; static DialogManagerImpl ms_instance;
}; };
@@ -478,7 +482,12 @@ namespace PortabilityLayer
dlogH.Dispose(); dlogH.Dispose();
DialogTemplate *dtemplate = LoadDialogTemplate(header.m_itemsResID); return LoadDialogFromTemplate(header.m_itemsResID, rect, header.m_visible != 0, header.m_hasCloseBox != 0, header.m_referenceConstant, positionSpec, behindWindow, PLPasStr(titlePStr), substitutions);
}
Dialog *DialogManagerImpl::LoadDialogFromTemplate(int16_t templateResID, const Rect &rect, bool visible, bool hasCloseBox, uint32_t referenceConstant, uint16_t positionSpec, Window *behindWindow, const PLPasStr &title, const DialogTextSubstitutions *substitutions)
{
DialogTemplate *dtemplate = LoadDialogTemplate(templateResID);
const size_t numItems = (dtemplate == nullptr) ? 0 : dtemplate->GetItems().Count(); const size_t numItems = (dtemplate == nullptr) ? 0 : dtemplate->GetItems().Count();
if (!rect.IsValid()) if (!rect.IsValid())
@@ -489,7 +498,7 @@ namespace PortabilityLayer
WindowManager *wm = PortabilityLayer::WindowManager::GetInstance(); WindowManager *wm = PortabilityLayer::WindowManager::GetInstance();
WindowDef wdef = WindowDef::Create(rect, WindowStyleFlags::kAlert, header.m_visible != 0, header.m_hasCloseBox != 0, header.m_referenceConstant, positionSpec, PLPasStr(titlePStr)); WindowDef wdef = WindowDef::Create(rect, WindowStyleFlags::kAlert, visible, hasCloseBox, referenceConstant, positionSpec, title);
Window *window = wm->CreateWindow(wdef); Window *window = wm->CreateWindow(wdef);
if (!window) if (!window)
{ {
@@ -524,6 +533,11 @@ namespace PortabilityLayer
return dialog; return dialog;
} }
int16_t DialogManagerImpl::AlertFilter(Dialog *dialog, const TimeTaggedVOSEvent &evt)
{
return -1;
}
int16_t DialogManagerImpl::DisplayAlert(int16_t alertResID, const DialogTextSubstitutions *substitutions) int16_t DialogManagerImpl::DisplayAlert(int16_t alertResID, const DialogTextSubstitutions *substitutions)
{ {
struct AlertResourceData struct AlertResourceData
@@ -571,8 +585,19 @@ namespace PortabilityLayer
// If sound index is 0, play no sound // If sound index is 0, play no sound
PL_NotYetImplemented(); if (soundIndexes[0] != 0)
PortabilityLayer::HostSystemServices::GetInstance()->Beep();
const Rect dialogRect = alertResData.m_rect.ToRect();
Dialog *dialog = LoadDialogFromTemplate(alertResData.m_dialogTemplateResID, alertResData.m_rect.ToRect(), true, false, 0, 0x300a, PL_GetPutInFrontWindowPtr(), PSTR(""), nullptr);
if (!dialog)
return 0; return 0;
int16_t hit = dialog->ExecuteModal(DialogManagerImpl::AlertFilter);
dialog->Destroy();
return hit;
} }
DialogTemplate *DialogManagerImpl::LoadDialogTemplate(int16_t resID) DialogTemplate *DialogManagerImpl::LoadDialogTemplate(int16_t resID)