Small change and attempt to fix workspace switch bug, but without success. Next time...

This commit is contained in:
Sanel Zukan 2012-04-03 09:05:34 +00:00
parent 03eae3c12f
commit 9d38486f61

View File

@ -1,9 +1,9 @@
#include "Applet.h" #include "Applet.h"
#include <string.h> #include <string.h>
#include <FL/Fl_Group.H> #include <FL/Fl_Group.H>
#include <FL/Fl.H> #include <FL/Fl.H>
#include <FL/fl_ask.H>
#include <edelib/Debug.h> #include <edelib/Debug.h>
#include <edelib/Netwm.h> #include <edelib/Netwm.h>
@ -26,9 +26,7 @@ public:
void workspace_changed(void); void workspace_changed(void);
}; };
static void box_cb(Fl_Widget*, void *b) { static void box_cb(PagerButton *pb, void *p) {
PagerButton *pb = (PagerButton*)b;
/* because workspaces in button labels are increased */ /* because workspaces in button labels are increased */
int s = pb->get_workspace_label() - 1; int s = pb->get_workspace_label() - 1;
netwm_workspace_change(s); netwm_workspace_change(s);
@ -98,7 +96,7 @@ void Pager::init_workspace_boxes(void) {
if(names) if(names)
bx->copy_tooltip(names[i]); bx->copy_tooltip(names[i]);
bx->callback(box_cb, bx); bx->callback((Fl_Callback*)box_cb, this);
add(bx); add(bx);
/* position for the next box */ /* position for the next box */
@ -110,10 +108,10 @@ void Pager::init_workspace_boxes(void) {
void Pager::workspace_changed(void) { void Pager::workspace_changed(void) {
int c = netwm_workspace_get_current(); int c = netwm_workspace_get_current();
PagerButton *pb;
E_RETURN_IF_FAIL(c < children()); E_RETURN_IF_FAIL(c < children());
PagerButton *pb;
for(int i = 0; i < children(); i++) { for(int i = 0; i < children(); i++) {
pb = (PagerButton*)child(i); pb = (PagerButton*)child(i);
pb->select_it(0); pb->select_it(0);