Skip to content

Support concatenating notifications #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
djdiskmachine merged 5 commits into from
Dec 24, 2025
Merged

Support concatenating notifications #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
08847f5
Support concatenating notifications
djdiskmachine Dec 23, 2025
7a21f38
Change notification from char* to string
djdiskmachine Dec 23, 2025
99be98d
Enable y offset for notifications
djdiskmachine Dec 24, 2025
10c6b67
Rename optional argument in header
djdiskmachine Dec 24, 2025
c99b1e5
Set default xoffset for notifications
djdiskmachine Dec 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions sources/Application/Views/BaseClasses/View.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,18 +243,22 @@ void View::EnableNotification() {
if ((SDL_GetTicks() - notificationTime_) <= NOTIFICATION_TIMEOUT) {
SetColor(CD_NORMAL);
GUITextProperties props;
DrawString(10, 2, displayNotification_, props);
} else {
int xOffset = 4;
DrawString(xOffset, notiDistY_, displayNotification_.c_str(), props);
} else {
displayNotification_ = "";
}
}

/*
Set displayed notification and save the current time
Set displayed notification
Saves the current time
Optionally set display y offset if not in a project (default == 2)
Allows negative offsets, use with care!
*/
void View::SetNotification(const char *notification) {
notificationTime_ = SDL_GetTicks();
displayNotification_ = (char*) notification;
isDirty_ = true;
void View::SetNotification(const char *notification, int offset) {
notificationTime_ = SDL_GetTicks();
displayNotification_ = notification;
notiDistY_ = offset;
isDirty_ = true;
}

5 changes: 3 additions & 2 deletions sources/Application/Views/BaseClasses/View.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class View : public Observable {
void DoModal(ModalView *view, ModalViewCallback cb = 0);

void EnableNotification();
void SetNotification(const char *notification);
void SetNotification(const char *notification, int offset = 2);

protected:
virtual void ProcessButtonMask(unsigned short mask, bool pressed) = 0;
Expand Down Expand Up @@ -161,7 +161,8 @@ class View : public Observable {
bool locked_;
uint32_t notificationTime_;
uint16_t NOTIFICATION_TIMEOUT;
char *displayNotification_;
std::string displayNotification_;
int notiDistY_;
static bool initPrivate_;
ModalView *modalView_;
ModalViewCallback modalViewCallback_;
Expand Down