# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # $(eval $(call gb_Executable_Executable,pdf2xml)) $(eval $(call gb_Executable_use_sdk_api,pdf2xml)) $(eval $(call gb_Executable_use_externals,pdf2xml,\ boost_headers \ cppunit \ zlib \ )) $(eval $(call gb_Executable_set_include,pdf2xml,\ -I$(SRCDIR)/sdext/source/pdfimport/inc \ $$(INCLUDE) \ )) $(eval $(call gb_Executable_use_libraries,pdf2xml,\ basegfx \ vcl \ comphelper \ cppu \ unotest \ cppuhelper \ sal \ tl \ xo \ i18nutil \ )) $(eval $(call gb_Executable_use_library_objects,pdf2xml,pdfimport)) $(eval $(call gb_Executable_add_exception_objects,pdf2xml,\ sdext/source/pdfimport/test/pdf2xml \ )) # vim:set noet sw=4 ts=4: ro/allotropia/zeta-7-3 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLászló Németh <nemeth@numbertext.org>2024-06-08 23:39:13 +0200
committerLászló Németh <nemeth@numbertext.org>2024-06-10 23:22:20 +0200
commitb285cf49dffe8a74f0ba54b88b781db6a68a4f3b (patch)
tree876739c8dde8e64505dfa50bc2fd44af23360f65
parent4cd4be3e7cc77953813a6f1713b6b8245ca92214 (diff)
tdf#157833 tdf#155692 sw: fix hit area to resize row/col
Fix 1) missing or too narrow hit area (tdf#157833), and 2) not recognized click inside hit area (tdf#155692). It was impossible or very hard to resize text table columns and rows using the mouse: 1) Double arrow, i.e. "resize row/col" mouse pointer shows the hit area of text table row/column borders. This was missing or was very narrow with normal zoom, because of an obsolete constant for low resolution displays. Change this constant used in IsSame() with scale-dependent values to support the same hit area on different zoom levels and with different screen resolutions. 2) Especially on bigger zoom, "resize row/col" mouse pointer, i. e. the visible hit area didn't guarantee drag & drop any more because of too small hit area in pixels in the svruler code base: clicking on not exactly center of the hit area resulted selection of cells or the cell content instead of drag & drop the border, violating WYSIWYG. Enlarge the default 1 pixel to 5 pixels to cover the whole hit area. Note: only for resizing table borders inside the document, not on the horizontal and vertical rulers. Change-Id: I398a0de782040b0ad18835658ed625117a6e0e06 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168605 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat
-rw-r--r--include/svtools/ruler.hxx11
-rw-r--r--svtools/source/control/ruler.cxx20
-rw-r--r--sw/qa/extras/uiwriter/uiwriter6.cxx134
-rw-r--r--sw/source/core/frmedt/fetab.cxx43
-rw-r--r--sw/source/uibase/docvw/edtwin3.cxx10
5 files changed, 187 insertions, 31 deletions
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 8acc70aa14c1..a7a0a581f941 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -691,8 +691,12 @@ private:
SVT_DLLPRIVATE bool ImplDoHitTest( const Point& rPosition,
RulerSelection* pHitTest,
bool bRequiredStyle = false,
- RulerIndentStyle nRequiredStyle = RulerIndentStyle::Top ) const;
- SVT_DLLPRIVATE bool ImplDocHitTest( const Point& rPos, RulerType eDragType, RulerSelection* pHitTest ) const;
+ RulerIndentStyle nRequiredStyle = RulerIndentStyle::Top,
+ tools::Long nTolerance = 1 ) const;
+ SVT_DLLPRIVATE bool ImplDocHitTest( const Point& rPos,
+ RulerType eDragType,
+ RulerSelection* pHitTest,
+ tools::Long nTolerance = 1 ) const;
SVT_DLLPRIVATE bool ImplStartDrag( RulerSelection const * pHitTest, sal_uInt16 nModifier );
SVT_DLLPRIVATE void ImplDrag( const Point& rPos );
SVT_DLLPRIVATE void ImplEndDrag();
@@ -743,7 +747,8 @@ public:
void SetExtraType( RulerExtra eNewExtraType, sal_uInt16 nStyle = 0 );
bool StartDocDrag( const MouseEvent& rMEvt,
- RulerType eDragType );
+ RulerType eDragType,
+ tools::Long nTolerance = 1 );
RulerType GetDragType() const { return meDragType; }
tools::Long GetDragPos() const { return mnDragPos; }
sal_uInt16 GetDragAryPos() const { return mnDragAryPos; }
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx