Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 3 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Commits on Dec 31, 2013
@bradallred bradallred Xcode: release builds need the symbols for the cocoa wrapper 1132d4e
@bradallred bradallred MapControl: always needs to redraw due to reflecting actor position i…
…n realtime

Its not a big enough deal to try and work out when the game is paused.
4c3dbcf
@bradallred bradallred EventMgr: we need to check that last_win_mousefocused exists
I didnt think it was possible to get a focus lock with no window, but I was wrong.
d42044d
View
5 apple/GemRB.xcodeproj/project.pbxproj
@@ -6300,6 +6300,7 @@
buildSettings = {
BUNDLE_LOADER = "${BUILT_PRODUCTS_DIR}/GemRB.app/Contents/MacOS/GemRB";
COMBINE_HIDPI_IMAGES = YES;
+ COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = "";
DYLIB_CURRENT_VERSION = "";
EXECUTABLE_EXTENSION = so;
@@ -6312,6 +6313,7 @@
INSTALL_PATH = "$(HOME)/Application Support/GemRB/plugins";
MACH_O_TYPE = mh_bundle;
PRODUCT_NAME = SDLVideo;
+ STRIP_INSTALLED_PRODUCT = NO;
UNEXPORTED_SYMBOLS_FILE = "";
};
name = Release;
@@ -6974,6 +6976,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
COMBINE_HIDPI_IMAGES = YES;
+ COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = (
/System/Library/Frameworks,
"$(FRAMEWORK_SEARCH_PATHS)",
@@ -6981,6 +6984,8 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
INFOPLIST_FILE = osx/Info.plist;
PRODUCT_NAME = GemRB;
+ STRIP_INSTALLED_PRODUCT = NO;
+ STRIP_STYLE = debugging;
WRAPPER_EXTENSION = app;
};
name = Release;
View
2  gemrb/core/GUI/EventMgr.cpp
@@ -180,7 +180,7 @@ void EventMgr::MouseMove(unsigned short x, unsigned short y)
// for scrolling
gc->OnGlobalMouseMove(x, y);
}
- if (focusLock) {
+ if (last_win_mousefocused && focusLock) {
last_win_mousefocused->OnMouseOver(x, y);
return;
}
View
1  gemrb/core/GUI/MapControl.h
@@ -50,6 +50,7 @@ class GEM_EXPORT MapControl : public Control {
/** Draws the Control on the Output Display */
void DrawInternal(Region& drawFrame);
void DrawFog(const Region& rgn);
+ bool NeedsDraw() {return true;}
public:
int ScrollX, ScrollY;
int NotePosX, NotePosY;

No commit comments for this range

Something went wrong with that request. Please try again.