X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fmain.h;h=5ca71efe5db9a06c83d315b38db64abe76557e38;hp=cfc69090f555ec70bd35ad453ce099a9dd59a5f5;hb=67fbce330b046b1f0d63222f04d83410dc1b2faa;hpb=55790e6cc129dcac3b3d001c7f5c74c288642123 diff --git a/src/main.h b/src/main.h index cfc6909..5ca71ef 100644 --- a/src/main.h +++ b/src/main.h @@ -78,12 +78,11 @@ void RatCatcher(int x, int y, int buttons, int wheel, Screen * scr, View * view) } -inline void MainLoop(Document & doc, const Rect & bounds = Rect(0,0,1,1), const Colour & c = Colour(0.f,0.f,0.f,1.f)) +inline void MainLoop(Document & doc, Screen & scr, View & view) { // order is important... segfaults occur when screen (which inits GL) is not constructed first -_- - Screen scr; - View view(doc,scr, bounds, c); - scr.DebugFontInit("DejaVuSansMono.ttf"); + + scr.DebugFontInit("fonts/DejaVuSansMono.ttf"); scr.SetMouseHandler(RatCatcher); double total_cpu_time = 0;