Skip to content

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.
...
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 9 additions and 24 deletions.
  1. +5 −23 apple/GemRB.xcodeproj/project.pbxproj
  2. +4 −1 gemrb/core/GUI/ScrollBar.cpp
View
28 apple/GemRB.xcodeproj/project.pbxproj
@@ -6745,6 +6745,7 @@
"-DHAVE_CONFIG_H",
"-W",
"-Wextra",
+ "-DTARGET_OS_MAC=0",
);
PRODUCT_NAME = GemRB;
PROVISIONING_PROFILE = "";
@@ -6785,9 +6786,10 @@
./,
"-DSTATIC_LINK",
"-DHAVE_CONFIG_H",
- "-DTARGET_OS_IPHONE",
+ "-DTARGET_OS_IPHONE=1",
"-W",
"-Wextra",
+ "-DTARGET_OS_MAC=0",
);
PRODUCT_NAME = GemRB;
PROVISIONING_PROFILE = "";
@@ -6992,19 +6994,6 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
INFOPLIST_FILE = osx/Info.plist;
- OTHER_CFLAGS = (
- "-DHAVE_CONFIG_H",
- "-DHAVE_ICONV=1",
- "-g",
- "-D_DEBUG",
- "-isystem",
- ./,
- "-W",
- "-Wextra",
- "-Wformat",
- "-Wall",
- "-DTARGET_OS_MAC",
- );
PRODUCT_NAME = GemRB;
WRAPPER_EXTENSION = app;
};
@@ -7022,15 +7011,6 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
INFOPLIST_FILE = osx/Info.plist;
- OTHER_CFLAGS = (
- "-DHAVE_CONFIG_H",
- "-isystem",
- ./,
- "-W",
- "-Wextra",
- "-Wformat",
- "-DTARGET_OS_MAC",
- );
PRODUCT_NAME = GemRB;
STRIP_INSTALLED_PRODUCT = NO;
STRIP_STYLE = debugging;
@@ -7087,6 +7067,7 @@
"-Wextra",
"-Wformat",
"-Wall",
+ "-DTARGET_OS_MAC=1",
);
SDKROOT = "";
"SDKROOT[arch=*]" = "";
@@ -7143,6 +7124,7 @@
"-W",
"-Wextra",
"-Wformat",
+ "-DTARGET_OS_MAC=1",
);
SDKROOT = "";
"SDKROOT[arch=*]" = "";
View
5 gemrb/core/GUI/ScrollBar.cpp
@@ -129,8 +129,11 @@ void ScrollBar::SetPosForY(short y)
TextArea* t = (TextArea*) ta;
unsigned int taY = y * (t->GetRowHeight() / stepPx);
t->ScrollToY(taY, this);
+ SliderYPos = y;
+ } else {
+ // other controls don't support per-pixel scrolling
+ SliderYPos = Pos * stepPx;
}
- SliderYPos = y;
} else {
// top is our default position
SliderYPos = 0;

No commit comments for this range

Something went wrong with that request. Please try again.