-Updated window size and header image
This commit is contained in:
parent
b9b3aab0a1
commit
0b64f78e0c
3 changed files with 7 additions and 11 deletions
|
@ -4,6 +4,8 @@
|
|||
|
||||
extern Gui* gui;
|
||||
|
||||
extern void luppp_tooltip(std::string s);
|
||||
|
||||
void gtrack_button_callback(Fl_Widget *w, void *data)
|
||||
{
|
||||
int track = 0;
|
||||
|
|
15
src/gui.cxx
15
src/gui.cxx
|
@ -20,7 +20,7 @@ using namespace std;
|
|||
extern Gui* gui;
|
||||
|
||||
|
||||
static void luppp_tooltip(std::string s)
|
||||
void luppp_tooltip(std::string s)
|
||||
{
|
||||
gui->setTooltip(s);
|
||||
}
|
||||
|
@ -34,7 +34,7 @@ void Gui::setTooltip( std::string s )
|
|||
void close_cb(Fl_Widget*o, void*) {
|
||||
if ((Fl::event() == FL_KEYDOWN || Fl::event() == FL_SHORTCUT)
|
||||
&& Fl::event_key() == FL_Escape)
|
||||
return; // ignore ESC
|
||||
return; // ignore ESC
|
||||
else o->hide();
|
||||
}
|
||||
|
||||
|
@ -46,20 +46,17 @@ static void gui_static_read_rb(void* inst)
|
|||
}
|
||||
|
||||
Gui::Gui() :
|
||||
window(1272,750)
|
||||
window(1110,750)
|
||||
{
|
||||
window.color(FL_BLACK);
|
||||
window.label("Luppp 5");
|
||||
window.label("Luppp");
|
||||
//window.callback( close_cb, 0 );
|
||||
|
||||
|
||||
Avtk::Image* headerImage = new Avtk::Image(0,0,1272,36,"header.png");
|
||||
Avtk::Image* headerImage = new Avtk::Image(0,0,1110,36,"header.png");
|
||||
headerImage->setPixbuf( header.pixel_data, 4 );
|
||||
|
||||
//tooltipLabel = new Fl_Box(100, 20, 200, 20, "tooltips go here");
|
||||
|
||||
//window.resizable( headerImage );
|
||||
|
||||
int i = 0;
|
||||
for (; i < NTRACKS; i++ )
|
||||
{
|
||||
|
@ -70,8 +67,6 @@ Gui::Gui() :
|
|||
|
||||
master = new GMasterTrack(8 + i * 118, 40, 150, 700, "Master");
|
||||
|
||||
unit = new GUnitTrack(9 + i * 118 + 158, 40, 150, 700, "Units");
|
||||
|
||||
window.end();
|
||||
}
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@ class Gui
|
|||
Fl_Box* box;
|
||||
|
||||
GMasterTrack* master;
|
||||
GUnitTrack* unit;
|
||||
|
||||
vector<GTrack*> tracks;
|
||||
|
||||
|
|
Loading…
Reference in a new issue