zynaddsubfx

ZynAddSubFX open source synthesizer
Log | Files | Refs | Submodules | LICENSE

commit 193ea810491aedc0c51b1013f087c863b38c69fd
parent 67ac4572948c65b71f1e3936c61719e6464d9ba4
Author: fundamental <mark.d.mccurry@gmail.com>
Date:   Sun,  5 Jan 2014 16:46:45 -0500

Enable Tooltips/Fine modes in NTK UI

Diffstat:
Msrc/UI/WidgetPDial.cpp | 10+++++-----
Msrc/main.cpp | 3+++
2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/UI/WidgetPDial.cpp b/src/UI/WidgetPDial.cpp @@ -41,7 +41,7 @@ void TipWin::draw() { //setup window draw_box(FL_BORDER_BOX, 0, 0, w(), h(), Fl_Color(175)); - fl_color(FL_BLACK); + fl_color(Fl_Tooltip::textcolor()); fl_font(labelfont(), labelsize()); //Draw the current string @@ -115,9 +115,9 @@ WidgetPDial::~WidgetPDial() int WidgetPDial::handle(int event) { -#ifdef NTK_GUI - return Fl_Dial::handle( event ); -#else +//#ifdef NTK_GUI +// return Fl_Dial::handle( event ); +//#else double dragsize, min = minimum(), max = maximum(); int my; @@ -156,7 +156,7 @@ int WidgetPDial::handle(int event) break; } return 0; -#endif +//#endif } void WidgetPDial::drawgradient(int cx, int cy, int sx, double m1, double m2) diff --git a/src/main.cpp b/src/main.cpp @@ -60,6 +60,7 @@ QApplication *app; #include <FL/Fl_Shared_Image.H> #include <FL/Fl_Tiled_Image.H> #include <FL/Fl_Dial.H> +#include <FL/Fl_Tooltip.H> #endif // FLTK_GUI MasterUI *ui; @@ -438,6 +439,8 @@ int main(int argc, char *argv[]) #ifdef NTK_GUI fl_register_images(); + Fl_Tooltip::textcolor(0x0); + Fl_Dial::default_style(Fl_Dial::PIXMAP_DIAL); if(Fl_Shared_Image *img = Fl_Shared_Image::get(PIXMAP_PATH "/knob.png"))