diff options
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/idletask.hxx | 6 | ||||
| -rw-r--r-- | include/vcl/outdev.hxx | 7 | ||||
| -rw-r--r-- | include/vcl/task.hxx | 5 | ||||
| -rw-r--r-- | include/vcl/vcllayout.hxx | 5 | ||||
| -rw-r--r-- | include/vcl/weld.hxx | 4 |
5 files changed, 21 insertions, 6 deletions
diff --git a/include/vcl/idletask.hxx b/include/vcl/idletask.hxx index fd5b17c61b..1b8e33b7b1 100644 --- a/include/vcl/idletask.hxx +++ b/include/vcl/idletask.hxx @@ -20,9 +20,9 @@ public: bool GetFlag() const; IdleTask(); - // Launch an Idle at TaskPriority::LOWEST and wait until it completes. Can - // be used to wait until pending Idles at higher TaskPriority::DEFAULT_IDLE - // have completed. + // Launch an Idle at reserved lowest priority of TaskPriority::TOOLKIT_DEBUG + // and wait until it completes. Can be used to wait until pending Idles at + // higher TaskPriority have completed. static void waitUntilIdleDispatched(); private: diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 3293645591..ea49f50506 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -52,6 +52,7 @@ #include <vcl/settings.hxx> #include <vcl/vclreferencebase.hxx> +#include <basegfx/range/b2drectangle.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/vector/b2enums.hxx> @@ -961,6 +962,11 @@ public: sal_uLong nLayoutWidth = 0, KernArraySpan aDXArray = KernArraySpan(), std::span<const sal_Bool> pKashidaArray = {}, const SalLayoutGlyphs* pGlyphs = nullptr ) const; + bool GetTextBoundRect( basegfx::B2DRectangle& rRect, + const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, + sal_uLong nLayoutWidth = 0, KernArraySpan aDXArray = KernArraySpan(), + std::span<const sal_Bool> pKashidaArray = {}, + const SalLayoutGlyphs* pGlyphs = nullptr ) const; tools::Rectangle ImplGetTextBoundRect( const SalLayout& ) const; @@ -1614,6 +1620,7 @@ public: SAL_WARN_UNUSED_RESULT tools::Polygon PixelToLogic(const tools::Polygon& rDevicePoly) const; SAL_WARN_UNUSED_RESULT tools::PolyPolygon PixelToLogic(const tools::PolyPolygon& rDevicePolyPoly) const; SAL_WARN_UNUSED_RESULT basegfx::B2DPolyPolygon PixelToLogic(const basegfx::B2DPolyPolygon& rDevicePolyPoly) const; + SAL_WARN_UNUSED_RESULT basegfx::B2DRectangle PixelToLogic(const basegfx::B2DRectangle& rDeviceRect) const; SAL_WARN_UNUSED_RESULT vcl::Region PixelToLogic(const vcl::Region& rDeviceRegion) const; SAL_WARN_UNUSED_RESULT Point PixelToLogic(const Point& rDevicePt, const MapMode& rMapMode) const; SAL_WARN_UNUSED_RESULT Size PixelToLogic(const Size& rDeviceSize, const MapMode& rMapMode) const; diff --git a/include/vcl/task.hxx b/include/vcl/task.hxx index 5ed8cde7ff..41c73bf396 100644 --- a/include/vcl/task.hxx +++ b/include/vcl/task.hxx @@ -34,10 +34,11 @@ enum class TaskPriority REPAINT, ///< All repaint events should go in here POST_PAINT, ///< Everything running directly after painting DEFAULT_IDLE, ///< Default idle priority - LOWEST ///< Low, very idle cleanup tasks + LOWEST, ///< Low, very idle cleanup tasks + TOOLKIT_DEBUG ///< Do not use. Solely for IdleTask::waitUntilIdleDispatched }; -#define PRIO_COUNT (static_cast<int>(TaskPriority::LOWEST) + 1) +#define PRIO_COUNT (static_cast<int>(TaskPriority::TOOLKIT_DEBUG) + 1) class VCL_DLLPUBLIC Task { diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx index 7c7a179b9b..c946f6f678 100644 --- a/include/vcl/vcllayout.hxx +++ b/include/vcl/vcllayout.hxx @@ -21,6 +21,7 @@ #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <basegfx/range/b2drectangle.hxx> #include <i18nlangtag/languagetag.hxx> #include <tools/gen.hxx> #include <tools/degree.hxx> @@ -103,7 +104,9 @@ public: virtual bool GetNextGlyph(const GlyphItem** pGlyph, basegfx::B2DPoint& rPos, int& nStart, const LogicalFontInstance** ppGlyphFont = nullptr) const = 0; virtual bool GetOutline(basegfx::B2DPolyPolygonVector&) const; - bool GetBoundRect(tools::Rectangle&) const; + bool GetBoundRect(basegfx::B2DRectangle&) const; + + static tools::Rectangle BoundRect2Rectangle(basegfx::B2DRectangle&); virtual SalLayoutGlyphs GetGlyphs() const; diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index fc585bdb10..2a4e1ef084 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -889,6 +889,10 @@ public: virtual void set_max_mru_count(int nCount) = 0; virtual OUString get_mru_entries() const = 0; virtual void set_mru_entries(const OUString& rEntries) = 0; + + // Backwards compatibility, should be avoided to allow + // UI consistency. + virtual void set_max_drop_down_rows(int nRows) = 0; }; enum class ColumnToggleType |