diff options
| author | fvogel <fvogelnew1@free.fr> | 2020-08-17 21:17:33 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2020-08-17 21:17:33 (GMT) |
| commit | 4ef6f9e85ea2f8c07537e7a7e5be419c37eceb31 (patch) | |
| tree | 2a7d80de8c543d06a6ec14efdb3542c4c5d81b32 | |
| parent | bf7475f9e1b78233c97014dcdb7a1c11c34ea4d9 (diff) | |
| parent | b60b0d50f5e96a40b302de1be13f383e98148aec (diff) | |
| download | tk-4ef6f9e85ea2f8c07537e7a7e5be419c37eceb31.zip tk-4ef6f9e85ea2f8c07537e7a7e5be419c37eceb31.tar.gz tk-4ef6f9e85ea2f8c07537e7a7e5be419c37eceb31.tar.bz2 | |
merge core-8-6-branch
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | generic/tkScale.c | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index e4662b3..7c6de08 100644 --- a/.travis.yml +++ b/.travis.yml @@ -209,6 +209,11 @@ jobs: - name: "macOS/Clang/Xcode 10/Shared" os: osx osx_image: xcode10.3 + addons: + homebrew: + packages: + - tcl-tk + update: true env: - BUILD_DIR=unix - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14" @@ -218,6 +223,11 @@ jobs: - name: "macOS/Clang/Xcode 9/Shared" os: osx osx_image: xcode9.4 + addons: + homebrew: + packages: + - tcl-tk + update: true env: - BUILD_DIR=unix - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.13" diff --git a/generic/tkScale.c b/generic/tkScale.c index affea94..d26f4e0 100644 --- a/generic/tkScale.c +++ b/generic/tkScale.c @@ -659,13 +659,11 @@ ConfigureScale( } } - /* - * Several options need special processing, such as parsing the - * orientation and creating GCs. - */ + /* + * The fromValue shall not be rounded to the resolution, but the + * toValue and tickInterval do. + */ - scalePtr->fromValue = TkRoundValueToResolution(scalePtr, - scalePtr->fromValue); scalePtr->toValue = TkRoundValueToResolution(scalePtr, scalePtr->toValue); scalePtr->tickInterval = TkRoundIntervalToResolution(scalePtr, scalePtr->tickInterval); |