59 Commits

Author SHA1 Message Date
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
28a99f8188 GTK: Properly ask wText what size it wants to please GTK 3.20
It's not really of any use as we do know any size would do as wText is
ours anyway, but GTK 3.20 doesn't like allocating without querying the
preferred size beforehand, so do it.

As wText has a size_request() of 100x100, this might change how we
allocate in case we used to underallocate it, but AFAIK we don't, and
it is the real minimum size expected.

X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/
X-Scintilla-Commit-ID: d06e3db3e26842cd136328df17eb6f864b3adc02
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
24f91981c0 Update Scintilla to version 3.6.4 2016-03-13 15:50:36 +01:00
Thomas Martitz
a032ed506e scintilla: add scintilla_object_* to the plugin api
Analogous to their legacy counterparts. Also required for gir-bindings
generated via g-ir-scanner.
2016-01-19 17:05:30 +01: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
945d6b6364 Merge pull request #746 from techee/scintilla_dispose
Backport Scintilla patch correctly disposing scrollbars
2015-11-15 00:19:53 +01:00
Jiří Techet
3d439b4cfc Backport Scintilla patch correctly disposing scrollbars
The unparent method should be called in dispose(), not in finalize().
This patch fixes that which removes some ugly warnings from OS X command
line.
2015-11-14 10:26:07 +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
10a04f71c3 Update Scintilla to version 3.5.5 2015-04-21 16:21:37 +02:00
Matthew Brush
87ee835ef2 Export scintilla_get_type() from libgeany
This is useful for plugins to be able to subclass the ScintillaObject
and use its full GObject features. The Overview plugin is one known
plugin that needs this.

Also update scintilla_changes.patch by running update-scintilla.sh
script with patch application commented-out and generating a reverse
diff using `git -R`, and manually remove `a/` and `b/` prefixes from
the resulting diff so it can be used with update-scintilla.sh script.
2015-04-11 13:35:11 -07:00
Colomban Wendling
9eee68b71d Fix exporting Scintilla symbols 2015-04-10 16:08:08 +02:00
Colomban Wendling
9644fb0ae2 Define GEANY_{EXPORT,API}_SYMBOL from the build system
This makes it easier to define it consistently to what the compiler
and platform supports, and avoids having to include a special header
everywhere, which is some kind of a problem for separate libraries
like TagManager and especially Scintilla.

As we only use these macros from the source and not the headers, it
is fine for it to be defined to a configure-time check from the build
system.

Warning: Although Waf and Windows makefiles are updated they are not
         tested an will probably required tuning.
2015-04-10 16:08:08 +02:00
Colomban Wendling
8ac86ce423 Update Scintilla to version 3.5.4 2015-03-08 14:30:34 +01:00
Jiří Techet
7fa8b3a695 Backport adaptive scrolling patch from scintilla 2015-03-04 12:40:45 +01:00
Nick Treleaven
8ebac60901 Fix strangely undefined GTK for PlatGtk.cxx by moving build dir (#1001) 2015-01-24 16:30:54 +00:00
Colomban Wendling
3996ae9268 Update Scintilla to version 3.5.3
Closes [bugs:#1041].
2015-01-20 15:56:38 +01: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
328c22eaf6 Update Scintilla to version 3.5.0 2014-08-13 14:07:03 +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
df5edd0032 Scintilla: fix missing redraws on GTK < 3.9.2
Also, make the recent redraw fixes depend on the GTK version Scintilla
is running against, rather than built against.  This allows for the
same build to work with both GTK < 3.9.2 or >= 3.9.2.
2014-05-19 14:31:11 +02:00
Colomban Wendling
9bcdd64be9 Update Scintilla to 3.4.2 pre-release 2014-05-17 22:15:57 +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
0dc9e4ec38 Import fix from upstream Scintilla to fix crash upon DnD with GTK3
This imports Scintilla commit e488315f2d30e1795f0899779bac948da41b4eef
from HG, "Bug: [#1481]. Incorrect event copying on GTK+ 3.x."
2013-05-25 17:48:49 +02:00
Colomban Wendling
6cff31488e Import fix from upstream Scintilla to fix crash on drag and drop
This imports Scintilla commit 06f36a3217229ec2c2a360e370ae1b07597ce7b6
from HG, "Fix crashes with SelectionText instances that did not have \0
terminators."
2013-05-25 17:45:07 +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
4d16754267 Update Scintilla to version 3.2.3
Closes #2909124, #3094431 and #3233160.
2012-10-25 17:09:34 +02:00