all repos — fluxbox @ abf2bd26e35d92cd5409ff59476dc832851adfb2

custom fork of the fluxbox windowmanager

fixed crash bug
fluxgen fluxgen
commit

abf2bd26e35d92cd5409ff59476dc832851adfb2

parent

75b1b052f52684a9799893b72aa92d0317af43f7

1 files changed, 9 insertions(+), 5 deletions(-)

jump to
M src/IconButton.ccsrc/IconButton.cc

@@ -20,7 +20,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: IconButton.cc,v 1.14 2004/01/11 16:08:07 fluxgen Exp $ +// $Id: IconButton.cc,v 1.15 2004/01/13 12:27:51 fluxgen Exp $ #include "IconButton.hh"

@@ -77,10 +77,13 @@ m_use_pixmap(true) {

FbTk::RefCount<FbTk::Command> focus(new FbTk::SimpleCommand<FluxboxWindow>(m_win, &FluxboxWindow::raiseAndFocus)); FbTk::RefCount<FbTk::Command> hidemenus(new FbTk::SimpleCommand<BScreen>(win.screen(), &BScreen::hideMenus)); - FbTk::MacroCommand *focus_macro = new FbTk::MacroCommand(); - focus_macro->add(hidemenus); - focus_macro->add(focus); - FbTk::RefCount<FbTk::Command> focus_cmd(focus_macro); + //!! TODO: There're some issues with MacroCommand when + // this object dies when the last macrocommand is executed (focused cmd) + // In iconbar mode Icons + // FbTk::MacroCommand *focus_macro = new FbTk::MacroCommand(); + // focus_macro->add(hidemenus); + // focus_macro->add(focus); + FbTk::RefCount<FbTk::Command> focus_cmd(focus); FbTk::RefCount<FbTk::Command> menu_cmd(new ::ShowMenu(m_win)); setOnClick(focus_cmd, 1); setOnClick(menu_cmd, 3);

@@ -94,6 +97,7 @@

IconButton::~IconButton() { } + void IconButton::exposeEvent(XExposeEvent &event) { if (m_icon_window == event.window)