NotifyBox is now window... to simplify a bunch of things.

This commit is contained in:
Sanel Zukan
2007-06-28 11:21:24 +00:00
parent 2bb9e5dc4c
commit cbc6571b77
3 changed files with 51 additions and 69 deletions

View File

@ -47,7 +47,7 @@
* Which widgets Fl::belowmouse() should skip. This should be updated
* when new non-icon child is added to Desktop window.
*/
#define NOT_SELECTABLE(widget) ((widget == this) || (widget == wallpaper) || (widget == notify))
#define NOT_SELECTABLE(widget) ((widget == this) || (widget == wallpaper))
Desktop* Desktop::pinstance = NULL;
bool running = false;
@ -134,10 +134,10 @@ Desktop::Desktop() : DESKTOP_WINDOW(0, 0, 100, 100, "") {
//wallpaper->hide();
wallpaper->set("/home/sanelz/walls/nin/1024x768-04.jpg");
//wallpaper->set("/home/sanelz/walls/nin/1024x768-02.jpg");
notify = new NotifyBox(w(), h());
notify->hide();
end();
notify = new NotifyBox(w(), h());
read_config();
set_bg_color(dsett->color, false);
@ -149,6 +149,7 @@ Desktop::~Desktop() {
delete dsett;
delete selbox;
delete notify;
}
void Desktop::init(void) {
@ -414,7 +415,6 @@ void Desktop::add_icon(DesktopIcon* ic) {
EASSERT(ic != NULL);
icons.push_back(ic);
// FIXME: validate this
add((Fl_Widget*)ic);
}
@ -587,7 +587,8 @@ void Desktop::notify_box(const char* msg, bool copy) {
else
notify->label(msg);
notify->show();
if(!notify->shown())
notify->show();
}
void Desktop::notify_box_color(Fl_Color col) {