mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-06 03:39:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #344 initial black screen on Mac OS X and small initial window size on Linux when .asepriterc is not present

Browse Source
This commit is contained in:
David Capello 2014-08-20 08:27:11 -03:00
parent 44c6f9400e
commit daa7adde14
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/modules/gui.cpp
View File

@ -153,19 +153,22 @@ static void save_gui_config();
// Initializes GUI. // Initializes GUI.
int init_module_gui() int init_module_gui()
{ {
int c, w, h, min_possible_dsk_res = 0;
bool maximized;
shortcuts = new std::vector<Shortcut*>; shortcuts = new std::vector<Shortcut*>;
// Set the graphics mode... int w, h;
bool maximized;
load_gui_config(w, h, maximized); load_gui_config(w, h, maximized);
try { try {
main_display = she::instance()->createDisplay(w, h, screen_scaling); if (w > 0 && h > 0)
main_display = she::instance()->createDisplay(w, h, screen_scaling);
} }
catch (const she::DisplayCreationException&) { catch (const she::DisplayCreationException&) {
for (c=min_possible_dsk_res; try_resolutions[c].width; ++c) { // Do nothing, the display wasn't created.
}
if (!main_display) {
for (int c=0; try_resolutions[c].width; ++c) {
try { try {
main_display = main_display =
she::instance()->createDisplay(try_resolutions[c].width, she::instance()->createDisplay(try_resolutions[c].width,

1
src/she/alleg4/she_alleg4.cpp
View File

@ -679,6 +679,7 @@ public:
} }
Display* createDisplay(int width, int height, int scale) override { Display* createDisplay(int width, int height, int scale) override {
PRINTF("Creating display %dx%d (scale = %d)\n", width, height, scale);
return new Alleg4Display(width, height, scale); return new Alleg4Display(width, height, scale);
} }