Additional notifications

djdiskmachine · Sep 24, 2024 · b086c44 · b086c44
1 parent b4dc706
commit b086c44
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/sources/Application/Views/BaseClasses/View.cpp b/sources/Application/Views/BaseClasses/View.cpp
@@ -245,7 +245,6 @@ void View::EnableNotification() {
 		SetColor(CD_NORMAL);
 		GUITextProperties props;
 		DrawString(10, 2, displayNotification_, props);
-		isDirty_ = true;
 	} else {
 		displayNotification_ = "";
 	}
@@ -257,5 +256,6 @@ void View::EnableNotification() {
 void View::SetNotification(const char *notification) {
 	notificationTime_ = SDL_GetTicks();
 	displayNotification_ = (char*) notification;
+	isDirty_ = true;
 }
 
diff --git a/sources/Application/Views/ChainView.cpp b/sources/Application/Views/ChainView.cpp
@@ -264,7 +264,7 @@ void ChainView::copySelection() {
     viewData_->chainRow_=saveRow_ ; 
     viewData_->chainCol_=saveCol_ ;
 
-    isDirty_=true ; 
+	View::SetNotification("copied selection");
 } ;
 
 /******************************************************
@@ -617,6 +617,7 @@ void ChainView::setTextProps(GUITextProperties &props,int row,int col,bool resto
 void ChainView::DrawView() {
 
 	Clear() ;
+	View::EnableNotification();
 
 	GUITextProperties props ;
 	GUIPoint pos=GetTitlePosition() ;
@@ -690,6 +691,7 @@ void ChainView::DrawView() {
 	if (player->IsRunning()) {
 		OnPlayerUpdate(PET_UPDATE) ;
 	} ;
+
 } ;
 
 void ChainView::OnPlayerUpdate(PlayerEventType eventType,unsigned int tick) {

diff --git a/sources/Application/Views/PhraseView.cpp b/sources/Application/Views/PhraseView.cpp
@@ -37,6 +37,7 @@ PhraseView::PhraseView(GUIWindow &w,ViewData *viewData):
 		clipboard_.note_[i]=0xFF ;
 		clipboard_.instr_[i]=0 ;
 	} ;
+	View::EnableNotification();
 }
 
 PhraseView::~PhraseView() {
@@ -508,7 +509,7 @@ void PhraseView::copySelection() {
     row_=saveRow_ ;
     col_=saveCol_ ;
 
-    isDirty_=true ; 
+	View::SetNotification("copied selection");
 };
 
 /******************************************************
@@ -723,6 +724,8 @@ void PhraseView::ProcessButtonMask(unsigned short mask,bool pressed) {
 						*c=(unsigned char)next ;
 						lastInstr_=next ;
 						isDirty_=true ;
+					} else {
+						View::SetNotification("No more instruments");
 					}
 				}
 			}else {
@@ -736,6 +739,8 @@ void PhraseView::ProcessButtonMask(unsigned short mask,bool pressed) {
 							*c=next ;
 							isDirty_=true ;
 							cmdEdit_.SetInt(next) ;
+						} else {
+							View::SetNotification("No more tables");
 						}
 					}
 				}
@@ -747,6 +752,8 @@ void PhraseView::ProcessButtonMask(unsigned short mask,bool pressed) {
 						*c=next ;
 						isDirty_=true ;
 						cmdEdit_.SetInt(next) ;
+					} else {
+						View::SetNotification("No more tables");
 					}
 				}
 			} ;
@@ -999,6 +1006,7 @@ void PhraseView::setTextProps(GUITextProperties & props, int row,int col,bool re
 void PhraseView::DrawView() {
 
 	Clear() ;
+	View::EnableNotification();
 
 	GUITextProperties props ;
 	GUIPoint pos=GetTitlePosition() ;

diff --git a/sources/Application/Views/SongView.cpp b/sources/Application/Views/SongView.cpp
@@ -330,7 +330,7 @@ void SongView::copySelection() {
     viewData_->songX_=saveX_ ;
     viewData_->songY_=saveY_ ;
     viewData_->songOffset_=saveOffset_ ;
-    isDirty_=true ;     
+	View::SetNotification("copied selection");
 }
 
 /******************************************************
@@ -852,6 +852,7 @@ void SongView::processSelectionButtonMask(unsigned int mask) {
 void SongView::DrawView() {
 
 	Clear() ;
+	View::EnableNotification();
 
 	GUITextProperties props ;
 	GUIPoint pos=GetTitlePosition() ;
@@ -881,7 +882,6 @@ void SongView::DrawView() {
 
 	DrawString(pos._x,pos._y,buffer.c_str(),props) ;
 
-    View::EnableNotification();
 	// Compute song grid location
 
 	GUIPoint anchor=GetAnchor() ;