summaryrefslogtreecommitdiff
path: root/vcl
AgeCommit message (Collapse)Author
2016-05-10tdf#99207: Fix incorrect RGB ordering in Graphite DWrite pathTim Eves
Direct 2D accepts colours specified as UINT32 ARGB values or floats. However GDI presents colours as COLOREFS which are 32 bit FBGR (F is a flag not an alpha) values. Passing a COLORREF to D2D1:ColorF swaps the red and blue channels. This patch converts the COLORREF into RGB float triples using the GDI colour macros. Change-Id: Iee5c00bfb10fa8771a2a1019976f70633cca4094 Reviewed-on: https://gerrit.libreoffice.org/24819 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Martin Hosken <martin_hosken@sil.org> Reviewed-on: https://gerrit.libreoffice.org/24823
2016-05-06opengl: combined commits for state trackingTomaž Vajngerl
Includes commits: opengl: track state of active and bound textures in context ba0a5708803d899de4c40cfe2c1697ae83b4827a opengl: track the state of scissor test and the dimensions 51e953a3579fb91f30f7f0d6159b737684976959 opengl: track the state of stencil test b8f0e6452cc019744c44997c92831d94086b35b7 opengl: sync scissor and stencil state, generic capability state a57d048f88ba6cac3ce1550e2a8a143a8887eb05 opengl: track the state of glViewport 540fee2dc7553152914f7f1d8a41921e765087ef Change-Id: I770a6a744c0c41850c576b928f027375962088aa Reviewed-on: https://gerrit.libreoffice.org/24508 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2016-05-06gtk3: various bits means different things againCaolán McNamara
so active tabs don't look active without this on recent gtks (cherry picked from commit 235411c9d47ecba88e46d859ea93bcecefb0c46e) Change-Id: Iafa1e65fb0cc096513cdfe12a09fb0ef4c4d2db0 Reviewed-on: https://gerrit.libreoffice.org/24651 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2016-05-06Resolves: tdf#98940 (-1 not mapping to maximum string length anymore)Matteo Casalin
Change-Id: I58e4a63bce17b880a97c7ccfb4d42dfb930e54c5 Reviewed-on: https://gerrit.libreoffice.org/24268 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit eca3455190ed9a2c4796e7954f2533dc71cd1ab6) Reviewed-on: https://gerrit.libreoffice.org/24654 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2016-05-03tdf#90319: make image flipping work when aLinearContext(...) code path chosenpasqualm
Image flipping can be processed following different code paths in bitmap.cxx. Has been verified that it was broken in Linux Mint (with cinnamon) because there a buggy code path was chosen which was not fixed in commit 3119440a80282692640378fde5e37974ab63f096 in master. This commit solves the problem for this code path Change-Id: I22257e70761ca5469c0424b5f9925681cfd4e2e3 Reviewed-on: https://gerrit.libreoffice.org/22753 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jacobo Aragunde Pérez <jaragunde@igalia.com> (cherry picked from commit 1e3d634e413abf2b4c2a6c70a87586d8c598054c) Reviewed-on: https://gerrit.libreoffice.org/23852 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-03Fix failure to print when using the D2DWrite pathTim Eves
It seems that D2D1DCRenderrTarget cannot bind to a DC on a printer device. Now whenever that attempt to bind the DC fails we run the legacy API path as a fallback. Change-Id: I6ad8d82e5280fd2dcf669310bab0f5bfc23a138a Reviewed-on: https://gerrit.libreoffice.org/23366 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Martin Hosken <martin_hosken@sil.org> Reviewed-on: https://gerrit.libreoffice.org/24603
2016-04-28tdf#89866 tdf#96504 vcl: fix printing of form controls with imagesMichael Stahl
Originally in 2004 commit 0339e43208cd7b98d302e420b39ac32911acaa56 added a "DBG_ASSERT( GetOutDevType() != OUTDEV_PRINTER, "DrawImage(): Images can't be drawn on any mprinter" );" Recently commit f749ffbdf4c007f1a42bcafc9c2723c47bac22d1 made the mistake of trusting this assertion to be correct and added Printer::DrawImage() overrides that do a hard "assert()" now and don't do any drawing. Armin claims that the implementation of OutputDevice::DrawImage() should actually work for Printer as well due to fall-backs and thus the original DBG_ASSERT was misleading. This matters when printing documents that contain form controls such as ImageControl. Additionally, Image::Draw() should not return early when IsDeviceOutputNecessary() is false, because that is the case when printing, where instead a meta-file is recorded. The called OutputDevice::DrawBitmapEx() will check IsDeviceOutputNecessary() internally anyway. This check was actually always there, so i do not understand how this should have worked in LO 4.2, as the bug reporters claim. (cherry picked from commit ef52ce82bf55b37279e344ea5fef67b4277fb009) Change-Id: I92ba19e7036197d1dde88c361f8e1cb59fae3a60 Reviewed-on: https://gerrit.libreoffice.org/24439 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-04-26-Werror=misleading-indentation (GCC 6)Stephan Bergmann
Change-Id: I50b57b3e78758271411bdb4c3d58a2413578db1c (cherry picked from commit d0e1cb02d87968bdfd6bbedecf41cd5a6ed1c644) Signed-off-by: David Tardon <dtardon@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/24405 Tested-by: Jenkins <ci@libreoffice.org>
2016-04-19Fix showing tooltips in RTL UI with GTK 3Khaled Hosny
Change-Id: I29c2c7988fb97e2472188a600a483e5f6ed12d80 Reviewed-on: https://gerrit.libreoffice.org/24057 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-04-18tdf#94682 limit the number of textures for the glyph texture atlasTomaž Vajngerl
Previously the number of textures in a packed texture atlas was not limited. After some time the number of the textures could grow quite a lot, however the first textures could contain very little glyphs that are valid. In this commit we add a new method ReduceTextureNumber which when called, reduces the number of textures that are tracked by the texutre atlas to the specified input number, and returnes the texture IDs that were removed so the caller can now clean-up any invalid (OpenGLTexutre) objects. Change-Id: I7790e8dddb4586167f860e0ecc81bda1f4dae21a Reviewed-on: https://gerrit.libreoffice.org/24071 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2016-04-18tdf#40863 only use polygons with area for WinClipRegionsArmin Le Grand
Due to a former fix CustomShapes have extra polygons with a single point in the top-left and bottom-right corner of their BoundRect, a workaround to allow getting their correct BoundRect in slideshow. Unfortunately this makes the win command CreatePolyPolygonRgn fail to create the needed ClipRegions so that the geometry is processed without clipping. Changed to only use polygons as input that have an area. Change-Id: I0eeda5776402777ed00de92f42a55f206575f58b Reviewed-on: https://gerrit.libreoffice.org/24059 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de> Reviewed-on: https://gerrit.libreoffice.org/24114
2016-04-15lp#1560328: clear cache before disposing rest of VCLBjoern Michaelsen
Change-Id: Iac325cf934953c61cb4dbbb67cfbab1777dc45cc Reviewed-on: https://gerrit.libreoffice.org/24039 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2016-04-14vcl: fix valgrind warning in g_lo_action_group_query_actionMichael Stahl
Change-Id: I0755254d4d6d24689d4f5b39c3a6c9a29ae53b99 (cherry picked from commit 9a31442171cf8bd79574c318d91ef220ee7389bb) Reviewed-on: https://gerrit.libreoffice.org/24063 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-04-14tdf#99244 opengl: miter limit for poly linesTomaž Vajngerl
(cherry picked from commit ea6196f0a51d1bf4cd722468406dcc8c64c7435c) also includes commit cb4015bb28dd7430efaaa523d04a155eb7e46305 Change-Id: I1c363a8f1d21bbacab0c5785544aa8becfe39363 Reviewed-on: https://gerrit.libreoffice.org/24072 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2016-04-12gtk3: the list/combo box hack to get internal buttons no longer worksCaolán McNamara
with gtk3-3.20.2 Change-Id: I608f3476a82233cb49e0b43c95f5a984d7c89c92 (cherry picked from commit 70cc48f17a61296021c035f351c3db68bc5e08ad) Reviewed-on: https://gerrit.libreoffice.org/23907 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-04-08tdf#94682 optimize texture drawing on Win. (squashed multi commits)Tomaž Vajngerl
Includes commits from master: opengl: deferred and optimized (text) texture drawing 96a098c0e8a009b77a26061dac3318da71d34ee4 opengl: texture atlas impl. to efficiently packs textures 40e9ed91bd8bbfecfc3832d73a81741d0aa97d3a opengl: use packed texture atlas for glyph cache in win. backend 80d0b2916db81a7f47bb1d368677016bbb870df6 opengl: fix wrong clipping when drawing text 094faaae6982472375420e57d6b9e34eefdbced8 opengl: cleanup texture, const internal format f65e77c965bb47d53c994d90b7fd0bf5009b343b Change-Id: I31ecd891d1d69e94973673930b0606e1ac884aab Reviewed-on: https://gerrit.libreoffice.org/23914 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2016-04-07tdf#98960 - DrawTransformedTexture adapted to the new area scale shaderMarco Cecchetti
Change-Id: I7c911f2aaccbffacfa5673b120b6177b8bea0672 Reviewed-on: https://gerrit.libreoffice.org/23865 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2016-04-06tdf#98989: vcl: fix handling of non-scalable fonts like "Courier"Michael Stahl
For a VirtualDevice only scalable fonts are cloned, but for non-scalable bitmap fonts still an empty PhysicalFontFamily with no PhysicalFontFace is created, which causes text to disappear (height 0). Suppress creation of such families like it was done in LO 4.3, so that the fall-back can handle it and map "Courier" to "Courier New". (regression from 8d6697587776136f3121733e1c29d4200720dbd9) (cherry picked from commit 2f89245fb7e1c94bed49dde10b08ab1cf41b597b) Change-Id: I6542a3f7a01bdf46ae2bcf328fa04064f7f86332 Reviewed-on: https://gerrit.libreoffice.org/23850 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-04-05opengl: fix loading shader with preamble that uses #versionTomaž Vajngerl
The preamble was inserted into a false position so the shader could was constructed incorrectly and would fail to compile. Change-Id: I4c51adde9014a326bbe38a5d2d17dd0047e33195 Reviewed-on: https://gerrit.libreoffice.org/23463 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2016-04-01tdf#98960 fix OpenGL crash by optimized image scalingMarco Cecchetti
using area scale shader - 2 passes impl - sqrt scale factor (cherry-picked from the commit f11a228cfd326bc089d7ff1c11a1561cdf5ee986) Change-Id: I973ae0a281735787b045ce8fd5df03f8caa8f189 Reviewed-on: https://gerrit.libreoffice.org/23613 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2016-03-31tdf#98812: follow-upMarco Cecchetti
pFont->mpFontInstance can be NULL. Reviewed-on: https://gerrit.libreoffice.org/23654 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 9fa87bb1a42c45446f78b4d8c8096d7ce90a8022) Signed-off-by: Michael Stahl <mstahl@redhat.com> Change-Id: I934703bc40621dc412e444cc9a370c7031cbbb86
2016-03-30vcl: tdf#98812: acquire reference count of WinFontInstancesMichael Stahl
... when they are inserted in WinSalGraphics::mpWinFontEntry. Not sure why one of these drops to 0 but is not removed from the WinSalGraphics when formatting this particular bugdoc. Acquiring the instances when retaining pointers to them should make the life cycle a little less insane. (cherry picked from commit 99207a26df0083851ba8e23be72d5c6974f98a3b) Change-Id: If1404f46a13736b2a226e198bdf0c3ca8e09bb38 Reviewed-on: https://gerrit.libreoffice.org/23504 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-03-25tdf#94734: fix icon in sidebar disappears when changing font colourBjoern Michaelsen
- properly initalize maImageOriginal along with maImage in various places - this is a regression from 27d94c482e82ea5d4f202109614c6fb3578fb0a4 - that commit is mostly innocent in itself though, only exposing omissions from b8f21298288890d52c06fef6c84441634c56c986 - having both maImage and maImageOriginal is extremely fragile as-is -- likely I'd be helpful to have them private in ImplToolItem and then a SetImage accessor with a tristate eOriginal/eCached/eBoth enum parameter to prevent oversights like this in the future ... Change-Id: I294d7ed8e07be5cadec0ae251cc08c8d089bd059 Reviewed-on: https://gerrit.libreoffice.org/23505 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2016-03-24tdf#98600 and tdf#98622 fix metafile parsing (part2)Noel Grandin
more regressions from commit db17d3c1 "new loplugin: memoryvar" Change-Id: I611697f2bc818f2f42a704bfb5297637c30060c9 (cherry picked from commit d4163c17ef47fdbc7d45adc5803b9844739b3324) Reviewed-on: https://gerrit.libreoffice.org/23470 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-03-24tdf#98600 and tdf#98622 fix metafile parsingNoel Grandin
regression from commit db17d3c1 "new loplugin: memoryvar" Change-Id: I8b11871cadcf50649533680be51c767d6bb98350 (cherry picked from commit c5bee7b8c1055e5052a261c8755bdb150fb27494) Reviewed-on: https://gerrit.libreoffice.org/23469 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-03-24opengl: fix inv.scale values are always integer - cid#1352479Tomaž Vajngerl
Force cast to double to avoid integer division - which gives a wrong inverse scale value. Change-Id: I0135e44ef07f3915619f9dfead9aadf50fc03685 Reviewed-on: https://gerrit.libreoffice.org/23462 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-03-23trying to get a GL context after GL de-initialization - fixedMarco Cecchetti
Change-Id: I5f38f72b0e2c0204875d0dfbb759d6b13415560a Reviewed-on: https://gerrit.libreoffice.org/23433 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2016-03-21tdf#98324 - PNG prints as black block with OpenGL - fixedMarco Cecchetti
Now the correct color palette is used. Change-Id: Ice532091713788c7c6b380550c65e26bc4b76c74 Reviewed-on: https://gerrit.libreoffice.org/23377 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2016-03-18Resolves: tdf#98726 sneaky transparent clearlooks-phenix scrollbarsCaolán McNamara
(cherry picked from commit e511f962c0b70e0ce0d19c42be1f198b6191fad1) Change-Id: Idc05d7b6c2b42086eafa9ad8ab8e63116d6f676c Reviewed-on: https://gerrit.libreoffice.org/23346 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
2016-03-17tdf#97319: Give up on attempting to cache non-BMP glyphs for SimpleWinLayoutTor Lillqvist
Add code to handle surrogate pairs in glyph caching, but I can't figure out why successive non-BMP glyphs in the bugdoc get drawn on top of each others. So bail out... Change-Id: Id1907cb766b9285d32e484049bec1b99159c5768 Reviewed-on: https://gerrit.libreoffice.org/23292 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-03-15tdf#79679 vcl: dashed lines show as solid lines when importing EMF filesChris Sherlock
Backported to 5.1 Issue is a regression in commit 09c722873b2d378d2d155f5f1dd7d8f3fb2012e9. (EMF/WMF: fix rendering of pen styles (dash, dot, dashdot, dashdotdot). I've looked at how the latest version of Word on the Mac works, and it turns out that the spacings for the PenStyle enumerations in the LogPen objects for all the create pen EMF records are as follows: * PS_DOT - ■ □ ■ □ ■ □ ■ □ ■ □ ■ * PS_DASHDOT - ■ ■ ■ □ ■ □ ■ ■ ■ □ ■ * PS_DASHDOTDOT - ■ ■ ■ □ ■ □ ■ □ ■ ■ ■ (where ■ is the actual filled in area, and □ is the space between the filled in areas) In other words, each dash fills in the space of three dots, and there is the one dot worth of empty space between the dashes and dots. Each "dot" has a width and height equal to the width specified in the pen. So basically, we seem to be arbitrarily setting the dot, dash and distance lengths arbitrarily, which were reasonable guesses but tended to produce very odd lines at different zoom levels. Change-Id: Ie8b5fa396e4fb0f480cb3594c8129a59f472c1b8 Reviewed-on: https://gerrit.libreoffice.org/22886 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> Tested-by: Chris Sherlock <chris.sherlock79@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/22923 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2016-03-15fix windows buildChristian Lohmaier
34a7b51ea482d4487d4fb8e61cde18aa1ff9b8ff (for 5-1) auto → size_t made 32bit happy, but win64bit still failed with: error C2784: ´_Ty std::min(std::initializer_list<_Elem>,_Pr)´ : could not deduce template argument for ´std::initializer_list<_Elem>´ from ´__int64´ (cherry picked from commit 53f645a9c959d93bde9230862c415c4ab2e3817b) Change-Id: Ib44840f692f1bcdea90decfe443c6eb72806002a Reviewed-on: https://gerrit.libreoffice.org/23288 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2016-03-15vcl: move graph.[hx]xx to graphic.[hc]xxChris Sherlock
It's IMO a bit confusing to see a "graph" header that doesn't strictly deal with graphs, but graphics. Backporting to 5.1 series to allow for easier backporting of other potential hotfixes. Change-Id: Ic37c6cd78e23d05939486f98667144c4453bb0a3 Reviewed-on: https://gerrit.libreoffice.org/22949 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2016-03-15Revert "fix memory leak in headless backend"jan iversen
This reverts commit eaaca6eaf26b0976f1c06f583a8aa35ee1c1b857. Causing tinderbox problems and reverted before making the 5.1.2 tag Change-Id: I987d1c5c839f020da150753f9a997a6824c1af67 Reviewed-on: https://gerrit.libreoffice.org/23286 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
2016-03-15fix memory leak in headless backendMarkus Mohrhard
Reviewed-on: https://gerrit.libreoffice.org/23248 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit c62afab9d4138583eb22afe46608b323f902f095) Change-Id: I90282c86b45845fc35b23b275301be24a2f18a4d Reviewed-on: https://gerrit.libreoffice.org/23261 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2016-03-15vcl: yield more cleanly and do less work for now.Michael Meeks
Change-Id: Ia3469fe4eb53f73fc85ee3c62db1411f9f4d1fb8 Reviewed-on: https://gerrit.libreoffice.org/23250 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: László Németh <nemeth@numbertext.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2016-03-15win: tinderbox band-aid for compilers that can't infer this type.Michael Meeks
Change-Id: Ie695a0ca3cdaa7c2b5cd0db9eaa1016aaa5c18a8 Reviewed-on: https://gerrit.libreoffice.org/23252 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-03-14Related: tdf#98419 use gtk_window_begin_move_drag bodge for wayland onlyCaolán McNamara
Change-Id: Ica19aef9b94e0c11e014f48b7801ecb0c110c44b (cherry picked from commit 380e5a98d2f20d77b8fc51bbea74f554dd24cdd1) Reviewed-on: https://gerrit.libreoffice.org/23105 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2016-03-14Related: tdf#98419 set a min size on un-resizeable non-layout dialogsCaolán McNamara
(see also rhbz#1281906) a min size equates to a size-request which is reliable under gtk3+wayland as the dialog contents size. a default size equates to the size of the dialog, which includes decorations under wayland (cherry picked from commit afeddaf7e0d11ad9b1df0c80bcc3f50caa87e21a) Change-Id: I20baf00fb5952ab93628f4dd6891779ce682783c Reviewed-on: https://gerrit.libreoffice.org/23121 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2016-03-14tdf#97171: Use DirectWrite for OpenGL glyph cachingTim Eves
A squash of several commits. Most important points mentioned below: DirectWrite rendering for Graphite to work around ExtTextOut bug where it incorrectly positions certain diacritics, using DirectWrite and Direct2D fixes this. Implemented on-demand loading of the DLL so the old ExTextOut based renderer will be used when drwite and d2d1 cannot be found allowing this work on Windows XP (where this bug doesn't seem to occur) Make the new D2D Graphite rendering work also in the OpenGL case It used to render just black boxes. The change in DrawTextImpl() semantics from 61085083e4a5060ba7e2135818264d63c6da13c2 was not properly implemented in the new Graphite code. The return value is not some kind of "success" indicator, but tells the caller whether to continue the loop at that level. We do need to call FillRect() to fill the requested rectangle of the HDC with white. On the other hand, the call to Clear() is not needed and in fact makes no text show up. (I now see that that same code snippet that calls FillRect() is used in all the DrawTextImpl() implementations, so it should be factored out to the call site in WinLayout::DrawText().) Factor out the calls to FillRect in the DrawTextImpl() implementations. They were all in fact doing exactly the same, so do it at the call site instead. Fix what seems to have been off-by-one errors in glyph bounds calculation. For some reason the error had a visible impact (as far as I an see, anyway) only for Graphite fonts. The bottommost pixels were cut off. (Also leftmost, but that was not so easily visible.) <tools/gen.hxx> Rectangle type, I love you. Refactor some previously private methods into public ones and reimplement parts of D2DWriteTextOutRenderer to user them. Also apply them to rendering the OpenGL glyph atlas, in an effort to workaround some bugs in legacy Windows text rendering APIs. I assume we want to initialise the rectangle with zero left/right/top/bottom and not using the default constructor, which sets the right and bottom coordinates to the magic value -32767. That made the 'bound' rectangle end up with rather amusing boundaries, like left=-32766, top=-16, right=-32576, bottom=6. Try calculating a chunks ascent & height from the inkboxes rather than using the font metrics which might not alway be correct when glyphs inkboxes are tall than the ascent or lower than the descent. Mark the mnAscent in the chunk bitmap debug output. Fix several miscalulations in positioning glyph to be rendered into that atlas. Fix vertical alignment problems. Inkboxes are returned with all co-ordinates relative to the glyphs not the fonts ascent. Therefor bounds.Top() is not the vertical overhang but the -ve height of the inkbox above the baseline. This fixes the calulation of the per Chunk ascent. Fix horizontal occsional alingment issues in OpenGL cached glyphs. The left edge of the src location rectangle for the first glyph in a cache chunk would set to extraspace and not zero, but all other rectangles in the chunk would be set from the aEnds array. This produced a bug where only certain letters would be mispositioned, proportional to the fonts point size. Rename OpenGLGlyphChunk::mnAscent to mnBaselineOffset to reflect curr use. Changed at Tor's stuggestion to better describe to it's use as it's value would be per chunk and based on the maximum ink box bounds of the glyphs in the chunk, rather than having anything to do with the font's real ascent value. Change-Id: I92ca17609022ae4af187e9a9f452a694fdd976ad Reviewed-on: https://gerrit.libreoffice.org/23246 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2016-03-14tdf#95616 - fix flickering issueMarco Cecchetti
Reviewed-on: https://gerrit.libreoffice.org/23238 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Signed-off-by: Michael Meeks <michael.meeks@collabora.com> Conflicts: vcl/opengl/gdiimpl.cxx Change-Id: I0d5bfdf44dde2cd06c193f34e81c6ce71291bba1
2016-03-13Resolves: tdf#92067 with duplicate menu entries track which to activateCaolán McNamara
rather than just stick 2/3/4 at the end embed that this is a dup as the prefix and strip that off at dispatch time and pass the dup index around as a counter to how many dup candidates to dismiss to find the desired one. (cherry picked from commit e22618a355c0e506b8cfac9c52e9564db26949d2) Change-Id: I81d97090a7e9b8c2995a3b27934f3ee5636d05fe Reviewed-on: https://gerrit.libreoffice.org/23183 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
2016-03-08tdf#98052 - even polygons were not drawn on the alpha deviceMarco Cecchetti
Change-Id: I5725ec23869b295c8021bef0330ee6f69f206351 Reviewed-on: https://gerrit.libreoffice.org/23026 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2016-03-06vcl: fix unit testChris Sherlock
Change-Id: I61a4e57dadee6f2350219c672125c03bb0462cdf Reviewed-on: https://gerrit.libreoffice.org/22965 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-03-06vcl: fix winmtf.hxx file to include constantsChris Sherlock
Change-Id: I3aa97c31d5e20bd506a8090f2613a21b9cc47b0b Reviewed-on: https://gerrit.libreoffice.org/22964 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-03-06Fix the import of line joins and caps from EMF filesStephan van den Akker
Backported fix to 5.1 Change-Id: I976336d35366b661e402db484820b4dd9a7b0228 Reviewed-on: https://gerrit.libreoffice.org/22821 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/22946 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-03-04tdf#98052 - polypolygons were not drawn on the alpha deviceMarco Cecchetti
In OutputDevice::DrawPolyPolygon when b2dpolygon are used for drawing the source polygon is not drawn on the alpha device. Change-Id: I54f4e5a13469d9844866cea61b074420219b836d Reviewed-on: https://gerrit.libreoffice.org/22893 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Jenkins <ci@libreoffice.org>
2016-03-03vcl: fix the MSVC buildMichael Stahl
Change-Id: I3607e90eb819a2afc4bc58072cdac74fb559bacb
2016-03-03tdf#98380 - opengl - get font anti-aliasing right.Michael Meeks
Change-Id: I087c4939c19bc5966da45cb848d71e95ac982e33 Reviewed-on: https://gerrit.libreoffice.org/22855 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: László Németh <nemeth@numbertext.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2016-03-02valgrind: fix g_variant leakCaolán McNamara
Change-Id: I6d10c7d20f9bc1dfcaa60ad89a9092fe06922074 (cherry picked from commit 9f61007bb01ac7f47fa164e4cb252a4338ee9bdc) Reviewed-on: https://gerrit.libreoffice.org/22816 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
generated by cgit (git 2.34.1) at 2025-03-12 15:54:28 +0000