openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix main window not receiving focus after leaving a file navigation dialog

Browse Source
This commit is contained in:
Celtic Minstrel
2014-04-14 20:35:30 -04:00
parent 441e0a5459
commit 121273bf57
5 changed files with 47 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
osx/tools/winutil.h
View File

@@ -15,16 +15,14 @@
namespace fs = boost::filesystem; // TODO: Centralize this alias
bool isFrontWindow(sf::Window& win);
void makeFrontWindow(sf::Window& win, bool acceptKeyInput = true);
void makeFrontWindow(sf::Window& win);
void init_fileio();
struct no_file_chosen {}; // an exception class
fs::path nav_get_party() throw(no_file_chosen);
fs::path nav_put_party() throw(no_file_chosen);
fs::path nav_get_scenario() throw(no_file_chosen);
fs::path nav_put_scenario() throw(no_file_chosen);
fs::path nav_get_party();
fs::path nav_put_party();
fs::path nav_get_scenario();
fs::path nav_put_scenario();
class ModalSession {
void* session;

43
osx/tools/winutil.mac.mm
View File

@@ -8,6 +8,7 @@
#include "winutil.h"
#include <Cocoa/Cocoa.h>
#include <SFML/Graphics/RenderWindow.hpp>
bool isFrontWindow(sf::Window& win) {
sf::WindowHandle handle = win.getSystemHandle();
@@ -53,6 +54,7 @@ NSOpenPanel* dlg_get_scen;
NSOpenPanel* dlg_get_game;
NSSavePanel* dlg_put_scen;
NSSavePanel* dlg_put_game;
extern sf::RenderWindow mainPtr;
// TODO: I'm not sure if I'll need delegates to enable selection of files with no file extension that have file creator types?
//Boolean scen_file_filter(AEDesc* item, void* info, void * dummy, NavFilterModes filterMode){
@@ -125,27 +127,34 @@ void init_fileio(){
[dlg_put_game retain];
}
fs::path nav_get_scenario() throw(no_file_chosen) {
// TODO: Not quite sure if runModal is right; I want to display it as a dialog, not as a sheet.
if([dlg_get_scen runModal] == NSFileHandlingPanelCancelButton)
throw no_file_chosen();
return fs::path([[[dlg_get_scen URL] absoluteString] UTF8String]);
fs::path nav_get_scenario() {
bool gotFile = [dlg_get_scen runModal] != NSFileHandlingPanelCancelButton;
makeFrontWindow(mainPtr);
if(gotFile)
return fs::path([[[dlg_get_scen URL] absoluteString] UTF8String]);
return "";
}
fs::path nav_put_scenario() throw(no_file_chosen) {
if([dlg_put_scen runModal] == NSFileHandlingPanelCancelButton)
throw no_file_chosen();
return [[[dlg_put_scen URL] absoluteString] UTF8String];
fs::path nav_put_scenario() {
bool gotFile = [dlg_put_scen runModal] != NSFileHandlingPanelCancelButton;
makeFrontWindow(mainPtr);
if(gotFile)
return [[[dlg_put_scen URL] absoluteString] UTF8String];
return "";
}
fs::path nav_get_party() throw(no_file_chosen) {
if([dlg_get_game runModal] == NSFileHandlingPanelCancelButton)
throw no_file_chosen();
return fs::path([[[dlg_get_game URL] absoluteString] UTF8String]);
fs::path nav_get_party() {
bool gotFile = [dlg_get_game runModal] != NSFileHandlingPanelCancelButton;
makeFrontWindow(mainPtr);
if(gotFile)
return fs::path([[[dlg_get_game URL] absoluteString] UTF8String]);
return "";
}
fs::path nav_put_party() throw(no_file_chosen) {
if([dlg_put_game runModal] == NSFileHandlingPanelCancelButton)
throw no_file_chosen();
return fs::path([[[dlg_put_game URL] absoluteString] UTF8String]);
fs::path nav_put_party() {
bool gotFile = [dlg_put_game runModal] != NSFileHandlingPanelCancelButton;
makeFrontWindow(mainPtr);
if(gotFile)
return fs::path([[[dlg_put_game URL] absoluteString] UTF8String]);
return "";
}