42 Commits

Author SHA1 Message Date
Colomban Wendling
aa11c3ea48 Update Scintilla to version 3.7.1 2016-12-05 14:23:34 +01:00
Colomban Wendling
db6f671135 GTK: Fix autoc font size on GTK >= 3.21.0
GTK 3.21.0 fixed font size handling, leading to properly interpreting
pixels and points in CSS declarations.  However, as older versions
incorrectly handled those, the code has to handle both behaviours.

From CSS, GTK < 3.21.0 actually applied the conversion to points, but
incorrectly: 10px was used as 10pt, but 10pt was scaled up twice.

So, assuming 96 DPI, it leads to:

font-size | 3.20.0  | 3.21.0  |
----------|---------|---------|
10px      | 13.33px | 10px    |
10pt      | 17.77px | 13.33px |

So, we need to fix the code to accommodate for both (either scaling
ourselves, or adapting the unit: I chose the second, simpler, option).

See https://git.gnome.org/browse/gtk+/commit/?id=df08fc91bdc1d2e4c866122304fabe4dd298a7de

X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1859/
X-Scintilla-Commit-ID: a4b5da8b3a0a05a1e67ba7eb08474106d421b088
2016-09-07 11:05:17 +02:00
Colomban Wendling
64025cfcfc Update Scintilla to version 3.6.6 2016-05-26 19:21:38 +02:00
Neil Hodgson
0a0c9bb7ce Move function braces for consistency.
X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/
X-Scintilla-Commit-ID: cdded8beb41e4a494e68b76a6bafeeae14b0d103
2016-05-02 15:19:26 +02:00
Colomban Wendling
ba58a391c7 GTK: Get border for the exact current style's state on GTK 3
GTK 3.20 doesn't seem to like it so much when looking up details of a
non-exact current style context state, so use the current one.

This is GTK being really picky as in this case we are just missing the
`DIR_LTR` flag, which we definitely don't care about, but let's make it
happy.

X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/
X-Scintilla-Commit-ID: 9fc624da4a3d935633c45fb56d0e9a77ef9b5af1
2016-05-02 15:19:26 +02:00
Colomban Wendling
abf0365e43 GTK: Fix auto-completion popup sizing code for GTK 3.20
GTK 3.20's GtkScrolledWinodw doesn't like having a too small allocation
and spews scary assertion failures.  Fix that by requesting the real
size we'd like instead of hard-coding 1 as small-enough value in our
overriding height requisition method.

The actual value doesn't really matter so long as it's small enough
anyway, as we resize the popup to fit later on.

Note: this moves the actual implementation of ListBoxX::GetRowHeight()
to the new convenience function treeViewGetRowHeight(), with no changes
in implementation.

X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/
X-Scintilla-Commit-ID: 5a0afdd87d56d837dd8068e234aed8e2b6bdbe93
2016-05-02 15:19:26 +02:00
Colomban Wendling
2723727ecd GTK: Plug a memory leak
X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/
X-Scintilla-Commit-ID: 4f96ed32ebb94809ca419c0f77d37de41984cf76
2016-05-02 15:19:26 +02:00
Colomban Wendling
ead0e9ee5f GTK: Fix fetching the frame border width on GTK 3.20
GTK 3.20 introduced a sub-node named "border" to the frame, requiring
to lookup the border on that sub-node rather than on the frame itself.

Unfortunately supporting this requires to be built against GTK 3.20, as
it requires API this version introduced.  This means that a build
against an older version won't be able to get the popup sizing right if
running on 3.20.  To mitigate this, add reasonable fallback defaults
when running 3.20 but built on an earlier version, to try and avoid

X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/
X-Scintilla-Commit-ID: 83d56b1fc63a206e4c1b776f5991b3b17ccb3473
2px-scrolling on GTK 3.20's default theme.
2016-05-02 15:19:26 +02:00
Colomban Wendling
915e8b781c GTK: Fix popup font on GTK >= 3.20
X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/
X-Scintilla-Commit-ID: a28863773874af35d3cc8912ae3c028fb0462ea9
2016-05-02 15:19:26 +02:00
Colomban Wendling
1403d352b2 Update Scintilla to version 3.6.5 2016-04-29 01:12:20 +02:00
Colomban Wendling
99938dd821 Update Scintilla to version 3.6.3
Includes improvements for Lua 5.3 and Perl 5.22.
2016-01-18 04:22:26 +01:00
Colomban Wendling
8afbc7a0b6 Update Scintilla to version 3.6.2
Keep scrollbar disposal changes that were backported and are not part
of 3.6.2.
2015-11-16 19:07:59 +01:00
Colomban Wendling
a1145c6ef6 GTK: Fix autoc popup row height on GTK2 when it changes at runtime
Now the popup is cached the row height has to be re-computed when the
font changes on GTK2 too.

Mostly closes #702.

X-Scintilla-Bug-URL: http://sourceforge.net/p/scintilla/bugs/1774/
X-Scintilla-Commit-ID: 547de78f2477e16b0d7241a217a1ead83a14c42b
2015-11-12 17:55:59 +01:00
Colomban Wendling
04ef30ea06 Update Scintilla to version 3.6.1 2015-09-20 18:39:15 +02:00
Colomban Wendling
67b464a586 GTK: Fix runtime completion popup warning
GtkScrolledWindow in GTK 3.16 might have a minimum and natural height
of 0 if GTK_OVERLAY_SCROLLING is enabled (which is the default), so we
need to fix our overridden minimal height to never be greater than the
natural height.

Do that by only changing the minimal height if it is greater than what
we want.

I don't know why we didn't use to set 0 here, but it might be that a
height of 0 caused problems on older GTK versions, so keep 1 to be sure.

X-Scintilla-Commit-ID: e9f9c964236a6b740f75d09a8b0ac76e5d6dd09f
2015-06-18 01:37:00 +02:00
Colomban Wendling
9b98d55def Update Scintilla to 3.5.6 pre-release
Fixes broken auto-completion popup on Windows.
2015-05-24 18:44:37 +02:00
Colomban Wendling
0a58f5012b Update Scintilla to version 3.5.2 2014-12-02 13:51:18 +01:00
Colomban Wendling
1e59b15c61 Update Scintilla to 3.5.1 pre-release 2014-09-26 00:23:29 +02:00
Colomban Wendling
0843705608 GTK: Don't hardcode auto-completion popup frame border width 2014-09-22 19:37:02 +02:00
Colomban Wendling
069e2d4ec5 GTK: Fix auto-completion popup sizing on some themes 2014-09-15 15:58:42 +02:00
Colomban Wendling
4d66bd3745 GTK: Allow the auto-completion popup to be as small as needed 2014-09-15 15:58:42 +02:00
Colomban Wendling
d1e519c11d GTK: Fix auto-completion popup width to better fit contents 2014-09-15 15:58:42 +02:00
Colomban Wendling
61eaf23a26 GTK: Fix auto-completion popup height to better fit contents 2014-09-15 15:58:42 +02:00
Colomban Wendling
df5b2fd810 GTK: fix cached completion popup window sizing
Only cache the popup window itself and not its content, as it seems the
window sizing is affected whether the content was just created or not.
2014-09-08 15:35:28 +02:00
Colomban Wendling
e6f8547e3e GTK: cache the completion popup window
This avoids creating and destroying windows quickly under stress, which
may lead to XID collisions.

See e.g. https://bugzilla.gnome.org/show_bug.cgi?id=581526 and
https://bugzilla.gnome.org/show_bug.cgi?id=590690

Closes [scintilla:bugs:1649].
2014-09-08 15:35:28 +02:00
Colomban Wendling
d77fe4c6b7 Update Scintilla to 3.5.0 pre-release 2014-08-10 02:17:32 +02:00
Colomban Wendling
98fa600a2f Update Scintilla to version 3.4.4 2014-07-04 03:06:17 +02:00
Colomban Wendling
6c5a0dd717 Update Scintilla to version 3.4.1 2014-04-14 16:25:01 +02:00
Colomban Wendling
635b7c24a6 Update Scintilla to version 3.3.6 2013-10-16 15:36:57 +02:00
Colomban Wendling
b07d1a1ecc Update Scintilla to version 3.3.5 2013-09-18 15:15:05 +02:00
Colomban Wendling
f0f3a6cd99 Update Scintilla to version 3.3.4 2013-07-21 12:04:14 +02:00
Colomban Wendling
8498957cf1 Update Scintilla to version 3.3.3 2013-06-06 16:31:47 +02:00
Colomban Wendling
f5588043b7 Update Scintilla to version 3.3.2 2013-05-22 03:23:57 +02:00
Colomban Wendling
e88c03d266 Update Scintilla to version 3.3.1 2013-04-27 18:29:44 +02:00
Colomban Wendling
d2a8a11587 Merge branch 'printing-with-scintilla' 2013-01-01 18:54:08 +01:00
Colomban Wendling
1bad1551d7 Scintilla: properly update the Pango contexts for the target surface
This fixes drawing on a surface that has different settings (like
scaling) than the display surface, by performing the measurements on a
layout properly set up for the target surface.

In practice, this fixes e.g. printing on a scaled surface.

(Applied to Scintilla HG as 74c71632dd1afa726b0f1608d13413e0864da9b0)
2013-01-01 18:51:52 +01:00
Colomban Wendling
654f07219f Update Scintilla to version 3.2.2 2012-09-05 00:37:41 +02:00
Colomban Wendling
4dd0fe9175 Update Scintilla to version 3.2.0 2012-06-26 20:48:16 +02:00
Colomban Wendling
cbc5600a1a Update to Scintilla 2.29 2011-10-19 03:40:46 +02:00
Colomban Wendling
b7e0ebfea1 Fix font rendering in the Scintilla when using Cairo
Always get the Pango context through GTK+ API rather than creating it
from a Cairo context to always get a context set up for the screen.

This fixes font size issues when using Cairo rendering.

Patch imported from upstream Mercurial (3596/070c7eb483bf).

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5690 ea778897-0a13-0410-b9d1-a72fbfd435f5
2011-04-04 17:58:07 +00:00
Enrico Tröger
c0b726a298 Update Scintilla to version 2.25.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5682 ea778897-0a13-0410-b9d1-a72fbfd435f5
2011-04-03 16:16:52 +00:00
Enrico Tröger
2c7d37dde4 Update Scintilla to version 2.22.
Keep Scintilla's directory structure mostly and only remove unused lexers.

For now, this will break the build. The build systems have to be updated as well as scintilla_changes.patch.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/unstable@5437 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-11-24 21:23:05 +00:00