* There was indeed a problem with my previous attempt at fixing #353. This should be much

better!


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28139 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexandre Deckner
2008-10-15 15:35:59 +00:00
parent 2f8909e465
commit 618c7ffa85
4 changed files with 80 additions and 4 deletions
+2 -2
View File
@@ -54,7 +54,7 @@ All rights reserved.
#include "IconMenuItem.h" #include "IconMenuItem.h"
#include "MountMenu.h" #include "MountMenu.h"
#include "PoseView.h" #include "PoseView.h"
#include "SlowContextPopup.h" #include "ShowingAwarePopUpMenu.h"
#include "Tracker.h" #include "Tracker.h"
#include "TemplatesMenu.h" #include "TemplatesMenu.h"
@@ -329,7 +329,7 @@ void
BDeskWindow::AddTrashContextMenu() BDeskWindow::AddTrashContextMenu()
{ {
// setup special trash context menu // setup special trash context menu
fTrashContextMenu = new BSlowContextMenu("TrashContext"); fTrashContextMenu = new BShowingAwarePopUpMenu("TrashContext");
fTrashContextMenu->SetFont(be_plain_font); fTrashContextMenu->SetFont(be_plain_font);
fTrashContextMenu->AddItem(new BMenuItem("Empty Trash", fTrashContextMenu->AddItem(new BMenuItem("Empty Trash",
new BMessage(kEmptyTrash))); new BMessage(kEmptyTrash)));
+3 -2
View File
@@ -41,9 +41,10 @@ All rights reserved.
#include "ContainerWindow.h" #include "ContainerWindow.h"
#include "DesktopPoseView.h" #include "DesktopPoseView.h"
class BSlowContextMenu;
namespace BPrivate { namespace BPrivate {
class BShowingAwarePopUpMenu;
class BDeskWindow : public BContainerWindow { class BDeskWindow : public BContainerWindow {
public: public:
@@ -82,7 +83,7 @@ protected:
private: private:
BShelf *fDeskShelf; BShelf *fDeskShelf;
// shelf for replicant support // shelf for replicant support
BSlowContextMenu *fTrashContextMenu; BShowingAwarePopUpMenu *fTrashContextMenu;
BRect fOldFrame; BRect fOldFrame;
@@ -0,0 +1,37 @@
/*
* Copyright 2008, Haiku Inc.
* Distributed under the terms of the MIT License.
*
* Authors:
* Alexandre Deckner, [email protected]
*/
#include "ShowingAwarePopUpMenu.h"
BShowingAwarePopUpMenu::BShowingAwarePopUpMenu(const char *title, bool radioMode,
bool autoRename, menu_layout layout)
: BPopUpMenu(title, radioMode, autoRename, layout),
fIsShowing(false)
{
}
BShowingAwarePopUpMenu::~BShowingAwarePopUpMenu()
{
}
void
BShowingAwarePopUpMenu::AttachedToWindow()
{
fIsShowing = true;
BPopUpMenu::AttachedToWindow();
}
void
BShowingAwarePopUpMenu::DetachedFromWindow()
{
fIsShowing = false;
}
+38
View File
@@ -0,0 +1,38 @@
/*
* Copyright 2008, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SHOWING_AWARE_POPUP_MENU_H
#define _SHOWING_AWARE_POPUP_MENU_H
#include <PopUpMenu.h>
namespace BPrivate {
class BShowingAwarePopUpMenu : public BPopUpMenu {
public:
BShowingAwarePopUpMenu(const char *title, bool radioMode = true,
bool autoRename = true, menu_layout layout = B_ITEMS_IN_COLUMN);
virtual ~BShowingAwarePopUpMenu();
virtual void AttachedToWindow();
virtual void DetachedFromWindow();
const bool IsShowing() const;
private:
bool fIsShowing;
};
} // namespace BPrivate
using namespace BPrivate;
inline const bool
BShowingAwarePopUpMenu::IsShowing() const
{
return fIsShowing;
}
#endif