added notification history #3368
Conversation
| @@ -35,6 +35,7 @@ class RibbonNotifier | |||
| public: | |||
| // adds new notification for drawing | |||
| void pushNotification( const RibbonNotification& notification ); | |||
| void drawNotificationHistoryButton( float scaling ); | |||
source/MRViewer/MRRibbonMenu.cpp
Outdated
| notifier_.drawNotificationHistoryButton( menu_scaling() ); | ||
| notifier_.drawNotifications( menu_scaling() ); |
There was a problem hiding this comment.
calc scaling once, and pass to both functions
| if ( ImGui::IsWindowAppearing() ) | ||
| { | ||
| if ( !activeModal ) | ||
| ImGui::BringWindowToDisplayFront( ImGui::GetCurrentWindow() ); // bring to front to be over modal background | ||
| if ( !ProgressBar::isOrdered() && !activeModal ) // do not focus window, not to close modal on appearing | ||
| ImGui::SetWindowFocus(); | ||
| } |
There was a problem hiding this comment.
it is not needed for "Notification History" it is simple button that should not appear over other windows
| if ( activeModal ) | ||
| { | ||
| // workaround to be able to hover notification even if modal is present | ||
| auto mousePos = ImGui::GetMousePos(); | ||
| isHovered = window->Rect().Contains( mousePos ) && !activeModal->Rect().Contains( mousePos ); | ||
| } | ||
| else | ||
| { | ||
| if ( notifications_.size() == cNotificationNumberLimit ) | ||
| notifications_.erase( notifications_.end() - 1 ); | ||
| notifications_.insert( notifications_.begin(), NotificationWithTimer{ notification } ); | ||
| isHovered = ImGui::IsWindowHovered(); | ||
| } |
…o #4657_notifiaction_history
|
|
||
| void RibbonNotifier::drawNotificationHistoryButton( float scaling ) | ||
| { | ||
| if ( !notifications_.empty() || notificationsHistory_.empty() ) |
There was a problem hiding this comment.
why check both, should check only notificationsHistory_
There was a problem hiding this comment.
i don't think it's necessary to show history button if we are already showing notifications
(notificationsHistory_ is empty only until first notification)
| } | ||
| requestClosestRedraw_(); | ||
| const float size = ImGui::GetTextLineHeight() + 10.f * scaling * 2.f; |
|
|
||
| ImGui::Begin( name.c_str(), nullptr, flags ); | ||
|
|
||
| iconsFont = RibbonFontManager::getFontByTypeStatic( RibbonFontManager::FontType::Icons ); |
| bool isHovered = false; | ||
| isHovered = ImGui::IsWindowHovered(); |
There was a problem hiding this comment.
bool isHovered = ImGui::IsWindowHovered();
| if ( ImGui::IsMouseClicked( ImGuiMouseButton_Left ) ) | ||
| { | ||
| for ( int i = int( notificationsHistory_.size() ) - 1; i >= 0; --i ) | ||
| { | ||
| const auto& nwt = notificationsHistory_[i]; | ||
| for ( int j = 0; j < nwt.sameCounter; ++j ) | ||
| addNotification_( notifications_, nwt.notification ); | ||
| } | ||
| requestClosestRedraw_(); | ||
| } |
There was a problem hiding this comment.
what if click several times? will notifications_ timer work and close them automatical?
| @@ -35,8 +35,8 @@ class RibbonNotifier | |||
| public: | |||
| // adds new notification for drawing | |||
| void pushNotification( const RibbonNotification& notification ); | |||
| // draws all present notifications | |||
| void drawNotifications( float scaling ); | |||
| // main draw function | |||
There was a problem hiding this comment.
please write more detailed comment, what does it draw
| const float cWindowRounding = 4.f; | ||
| const float cWIndowSpacing = 20.f; |
There was a problem hiding this comment.
we already have MRRibbonConstants.h mb use constants form there
| if ( auto menu = getViewerInstance().getMenuPluginAs<RibbonMenu>() ) | ||
| notificationsPosX += float( menu->getSceneSize().x ); |
There was a problem hiding this comment.
instead of dynamic casting RibbonMenu mb take it as argument from draw? or set as class field? or better sceneSize
| @@ -209,7 +407,23 @@ void RibbonNotifier::drawNotifications( float scaling ) | |||
| ImGui::PopStyleVar( 4 ); | |||
| currentPos.y -= window->Size.y; | |||
| } | |||
| filterInvalid_( numInvalid ); | |||
|
|
|||
| historyBtnPosY_ = currentPos.y - cWIndowSpacing * scaling; | |||
There was a problem hiding this comment.
why do we update it each frame? should be always in the same position?
There was a problem hiding this comment.
yes, button is located above upper-left corner of notifications
…o #4657_notifiaction_history # Conflicts: # source/MRViewer/MRRibbonMenu.cpp # source/MRViewer/MRRibbonNotification.h
No description provided.