diff -Nru fltk-dash-0.0.1ubuntu1/debian/bzr-builder.manifest fltk-dash-0.0.1ubuntu1/debian/bzr-builder.manifest --- fltk-dash-0.0.1ubuntu1/debian/bzr-builder.manifest 2017-09-11 13:21:19.000000000 +0000 +++ fltk-dash-0.0.1ubuntu1/debian/bzr-builder.manifest 2017-09-11 14:14:39.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-12 -lp:~israeldahl/+junk/fltk-dash revid:israeldahl@gmail.com-20170911131852-gogxzqkd2vp92jjx +# bzr-builder format 0.3 deb-version {debupstream}-14 +lp:~israeldahl/+junk/fltk-dash revid:israeldahl@gmail.com-20170911141144-yqr1hzslrivj7gc2 diff -Nru fltk-dash-0.0.1ubuntu1/debian/changelog fltk-dash-0.0.1ubuntu1/debian/changelog --- fltk-dash-0.0.1ubuntu1/debian/changelog 2017-09-11 13:21:19.000000000 +0000 +++ fltk-dash-0.0.1ubuntu1/debian/changelog 2017-09-11 14:14:39.000000000 +0000 @@ -1,8 +1,8 @@ -fltk-dash (0.0.1ubuntu1-12~ubuntu16.04.1) xenial; urgency=low +fltk-dash (0.0.1ubuntu1-14~ubuntu16.04.1) xenial; urgency=low * Auto build. - -- Israel Dahl Mon, 11 Sep 2017 13:21:19 +0000 + -- Israel Dahl Mon, 11 Sep 2017 14:14:39 +0000 fltk-dash (0.0.1ubuntu1) UNRELEASED; urgency=medium diff -Nru fltk-dash-0.0.1ubuntu1/README.md fltk-dash-0.0.1ubuntu1/README.md --- fltk-dash-0.0.1ubuntu1/README.md 2017-09-11 13:21:19.000000000 +0000 +++ fltk-dash-0.0.1ubuntu1/README.md 2017-09-11 14:14:39.000000000 +0000 @@ -10,3 +10,8 @@ mainly made for mpmc's usage. AppImage available [here](https://bintray.com/israeldahl/AppImages/fltk-dash#files) + +It has since become more robust since I originally threw it together, there are now rather complete configuration options. +The menu window will remember width and height as well as position when you close it. +You can configure it to resize, as well as change the font, and position of the search bar. +Feel free to request features, or file bugs! Binary files /tmp/tmpLvoTL1/FSIll50aSQ/fltk-dash-0.0.1ubuntu1/screenshot.gif and /tmp/tmpLvoTL1/o0CRZ4h6ze/fltk-dash-0.0.1ubuntu1/screenshot.gif differ diff -Nru fltk-dash-0.0.1ubuntu1/src/fltk-dash.cxx fltk-dash-0.0.1ubuntu1/src/fltk-dash.cxx --- fltk-dash-0.0.1ubuntu1/src/fltk-dash.cxx 2017-09-11 13:21:19.000000000 +0000 +++ fltk-dash-0.0.1ubuntu1/src/fltk-dash.cxx 2017-09-11 14:14:39.000000000 +0000 @@ -211,6 +211,14 @@ ((Dash*)(o->parent()->parent()->user_data()))->cb_resize_i(o,v); } +void Dash::cb_closeonclick_i(Fl_Check_Button* o, void*) { + CLOSE_ON_CLICK=false; +if(o->value()==1){CLOSE_ON_CLICK=true;}; +} +void Dash::cb_closeonclick(Fl_Check_Button* o, void* v) { + ((Dash*)(o->parent()->parent()->user_data()))->cb_closeonclick_i(o,v); +} + void Dash::cb_Font_i(Fl_Button*, void*) { font_window()->show(); } @@ -442,6 +450,7 @@ setlabelfont(recent,CURRENT_FONT,FONT_SIZE); setbrowserfont(list_browser,CURRENT_FONT,FONT_SIZE); setbrowserfont(recent_browser,CURRENT_FONT,FONT_SIZE); + setinputfont(searcher,CURRENT_FONT,FONT_SIZE); } void Dash::setup() { @@ -502,6 +511,8 @@ closeonclick->down_box(FL_GTK_DOWN_BOX); closeonclick->color((Fl_Color)55); closeonclick->selection_color(FL_GREEN); + closeonclick->callback((Fl_Callback*)cb_closeonclick); + closeonclick->when(FL_WHEN_CHANGED); if(closeOnClick()){o->value(1);} else{o->value(0);} } // Fl_Check_Button* closeonclick @@ -565,6 +576,14 @@ if(F==0){CURRENT_FONT=getFlFont();} CURRENT_FONT=F; o->textfont(CURRENT_FONT); + o->textsize(SIZE); + o->redraw(); +} + +void Dash::setinputfont(Fl_Input* o,int F,int SIZE) { + if(F==0){CURRENT_FONT=getFlFont();} + CURRENT_FONT=F; + o->textfont(CURRENT_FONT); o->textsize(SIZE); o->redraw(); } diff -Nru fltk-dash-0.0.1ubuntu1/src/fltk-dash.fld fltk-dash-0.0.1ubuntu1/src/fltk-dash.fld --- fltk-dash-0.0.1ubuntu1/src/fltk-dash.fld 2017-09-11 13:21:19.000000000 +0000 +++ fltk-dash-0.0.1ubuntu1/src/fltk-dash.fld 2017-09-11 14:14:39.000000000 +0000 @@ -71,7 +71,7 @@ xywh {0 39 260 341} box FLAT_BOX color 46 selection_color 52 align 2 } { Fl_Group all_apps { - label All open selected + label All open xywh {0 59 260 320} color 52 selection_color 46 } { Fl_Browser list_browser { @@ -208,7 +208,8 @@ setlabelfont(all_apps,CURRENT_FONT,FONT_SIZE); setlabelfont(recent,CURRENT_FONT,FONT_SIZE); setbrowserfont(list_browser,CURRENT_FONT,FONT_SIZE); -setbrowserfont(recent_browser,CURRENT_FONT,FONT_SIZE);} {} +setbrowserfont(recent_browser,CURRENT_FONT,FONT_SIZE); +setinputfont(searcher,CURRENT_FONT,FONT_SIZE);} {} } Function {setup()} {open } { @@ -225,7 +226,7 @@ } { Fl_Window conf_win { label Settings open - xywh {124 174 230 240} type Double hide + xywh {124 174 230 240} type Double visible } { Fl_Scroll {} {open xywh {0 0 230 245} @@ -272,7 +273,9 @@ } Fl_Check_Button closeonclick { label {Close on Click} - tooltip {Close when application is selected} xywh {5 80 125 35} down_box GTK_DOWN_BOX color 55 selection_color 63 + callback {CLOSE_ON_CLICK=false; +if(o->value()==1){CLOSE_ON_CLICK=true;}} + tooltip {Close when application is selected} xywh {5 80 125 35} down_box GTK_DOWN_BOX color 55 selection_color 63 when 1 code0 {if(closeOnClick()){o->value(1);}} code1 {else{o->value(0);}} } @@ -335,6 +338,14 @@ } { code {if(F==0){CURRENT_FONT=getFlFont();} CURRENT_FONT=F; +o->textfont(CURRENT_FONT); +o->textsize(SIZE); +o->redraw();} {} + } + Function {setinputfont(Fl_Input* o,int F,int SIZE)} {open selected + } { + code {if(F==0){CURRENT_FONT=getFlFont();} +CURRENT_FONT=F; o->textfont(CURRENT_FONT); o->textsize(SIZE); o->redraw();} {} diff -Nru fltk-dash-0.0.1ubuntu1/src/fltk-dash.h fltk-dash-0.0.1ubuntu1/src/fltk-dash.h --- fltk-dash-0.0.1ubuntu1/src/fltk-dash.h 2017-09-11 13:21:19.000000000 +0000 +++ fltk-dash-0.0.1ubuntu1/src/fltk-dash.h 2017-09-11 14:14:39.000000000 +0000 @@ -97,6 +97,8 @@ public: Fl_Check_Button *closeonclick; private: + inline void cb_closeonclick_i(Fl_Check_Button*, void*); + static void cb_closeonclick(Fl_Check_Button*, void*); inline void cb_Font_i(Fl_Button*, void*); static void cb_Font(Fl_Button*, void*); public: @@ -115,5 +117,6 @@ public: void setlabelfont(Fl_Widget* o,int F,int SIZE); void setbrowserfont(Fl_Browser* o,int F,int SIZE); + void setinputfont(Fl_Input* o,int F,int SIZE); }; #endif diff -Nru fltk-dash-0.0.1ubuntu1/src/menu.cpp fltk-dash-0.0.1ubuntu1/src/menu.cpp --- fltk-dash-0.0.1ubuntu1/src/menu.cpp 2017-09-11 13:21:19.000000000 +0000 +++ fltk-dash-0.0.1ubuntu1/src/menu.cpp 2017-09-11 14:14:39.000000000 +0000 @@ -686,7 +686,9 @@ void populateBrowserWithStringVector(Fl_Browser *o, std::vector STRING_VEC,bool hide){ int line=1; int col1=310; + int Width=get_w(); if(hide){col1=200;} + if(Width>col1)col1=Width+32; static int widths[] = { col1,0,0,0}; o->clear(); // widths for each column