cui/qa/uitest/dialogs/shortcuts.py | 31 +++++++++++++++++------------
sc/uiconfig/scalc/ui/drawtemplatedialog.ui | 1
sc/uiconfig/scalc/ui/formatcellsdialog.ui | 1
sc/uiconfig/scalc/ui/pagetemplatedialog.ui | 1
sc/uiconfig/scalc/ui/paratemplatedialog.ui | 1
sd/uiconfig/simpress/ui/templatedialog.ui | 1
sw/uiconfig/swriter/ui/framedialog.ui | 1
sw/uiconfig/swriter/ui/templatedialog1.ui | 1
sw/uiconfig/swriter/ui/templatedialog16.ui | 1
sw/uiconfig/swriter/ui/templatedialog2.ui | 1
sw/uiconfig/swriter/ui/templatedialog4.ui | 1
sw/uiconfig/swriter/ui/templatedialog8.ui | 1
vcl/source/control/imivctl1.cxx | 29 +++++++++++----------------
vcl/source/control/ivctrl.cxx | 4 +--
14 files changed, 33 insertions(+), 42 deletions(-)
New commits:
commit d1400c14d8e37dce8deed80fe0b2f10f6115673a
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Jun 19 20:29:36 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Jun 21 15:52:54 2024 +0200
tdf#161659: Revert "tdf#161030 Improve vertical... ( 24.8 only )
... Tab list display" )
This reverts commit f6ea343e6fb2dc3539823dee60c9c6f96fc16275.
Change-Id: I09713e297b3e5c939381a49f64b3207ad451a37f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169231
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx
index dca91c7d4163..ea69fbcfb99b 100644
--- a/vcl/source/control/imivctl1.cxx
+++ b/vcl/source/control/imivctl1.cxx
@@ -92,7 +92,7 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
aVisRectChangedIdle.SetInvokeHandler(LINK(this,SvxIconChoiceCtrl_Impl,VisRectChangedHdl));
Clear( true );
- Size gridSize((nWinStyle & WB_DETAILS) ? 150 : 100, (nWinStyle &
WB_DETAILS) ? 20 : 70);
+ Size gridSize((nWinStyle & WB_DETAILS) ? 200 : 100, (nWinStyle &
WB_DETAILS) ? 20 : 70);
if(pView->GetDPIScaleFactor() > 1)
{
gridSize.setHeight( gridSize.Height() * ( pView->GetDPIScaleFactor()) );
@@ -1942,22 +1942,19 @@ void SvxIconChoiceCtrl_Impl::MakeVisible( const
tools::Rectangle& rRect, bool bS
else
nDy = 0;
- tools::Long nDx = 0;
-
- // no horizontal scrolling needed in list mode
- if (!(nWinBits & WB_DETAILS))
+ tools::Long nDx;
+ if( aVirtRect.Left() < aOutputArea.Left() )
{
- if( aVirtRect.Left() < aOutputArea.Left() )
- {
- // scroll to the left (nDx < 0)
- nDx = aVirtRect.Left() - aOutputArea.Left();
- }
- else if( aVirtRect.Right() > aOutputArea.Right() )
- {
- // scroll to the right (nDx > 0)
- nDx = aVirtRect.Right() - aOutputArea.Right();
- }
+ // scroll to the left (nDx < 0)
+ nDx = aVirtRect.Left() - aOutputArea.Left();
+ }
+ else if( aVirtRect.Right() > aOutputArea.Right() )
+ {
+ // scroll to the right (nDx > 0)
+ nDx = aVirtRect.Right() - aOutputArea.Right();
}
+ else
+ nDx = 0;
aOrigin.AdjustX(nDx );
aOrigin.AdjustY(nDy );
diff --git a/vcl/source/control/ivctrl.cxx b/vcl/source/control/ivctrl.cxx
index c17a0caf359d..cb0c4e33d0c3 100644
--- a/vcl/source/control/ivctrl.cxx
+++ b/vcl/source/control/ivctrl.cxx
@@ -447,9 +447,9 @@ VerticalTabControl::VerticalTabControl(vcl::Window*
pParent, bool bWithIcons)
SetType(WindowType::VERTICALTABCONTROL);
m_xChooser->SetSelectionMode(SelectionMode::Single);
m_xChooser->SetClickHdl(LINK(this, VerticalTabControl, ChosePageHdl_Impl));
- m_xChooser->set_width_request(150);
+ m_xChooser->set_width_request(110);
m_xChooser->set_height_request(400);
- m_xChooser->SetSizePixel(Size(150, 400));
+ m_xChooser->SetSizePixel(Size(110, 400));
m_xBox->set_vexpand(true);
m_xBox->set_hexpand(true);
m_xBox->set_expand(true);
commit da21a102d072e73db8f7b8594903bf2780f6cdac
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Jun 19 16:16:34 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Jun 21 15:52:42 2024 +0200
tdf#99528: revert vertical tabs changes (24.8 only)
This reverts
* 30380c2f9888685ddceaafc9fb3a637e7167a3ac
"tdf#99528 Use vertical tabs in para dialog"
* 971db10d73a0fe80cceca70d19edd02de30be414
"tdf#99528 Use vertical tabs in Calc draw styles dialog"
* 2199e603691a770ea6b67cbaba4ce1e0ce7b1919
"tdf#99528 Use vertical tabs in 'Format cells' dialog"
* d71ea85d286a9a89e6cf784da90a820a09c0db2e
"tdf#99528 Use vertical tabs in Calc page styles dialog"
* 2a41f854ceb2860239b1d7ec8fbc3d460c7499a1
"tdf#99528 Use vertical tabs in Calc paragraph styles dialog"
* d700acbcba68e8b56e22db53bfcdfeb4c5777b9c
"tdf#99528 Use vertical tabs in Frame dialog"
* 62172db2d71fdc49a3ad9c177b8635353b90a7eb
"tdf#99528 Use vertical tabs in character style dialog"
* 30380c2f9888685ddceaafc9fb3a637e7167a3ac
"tdf#99528 Use vertical tabs in para dialog"
* d9bcf481b40d2a20169a98eb53caf7b19a03f3b8
"tdf#99528 Use vertical tabs in list style dialog"
* e5e9ed7b87072c3c6366f50127cf2b9cf6bf4499
"tdf#99528 Use vertical tabs in page dialog"
* 2f141c543494f44eab05db79533c60d342213901
"tdf#99528 Use vertical tabs in frame style dialog"
Change-Id: I632e7347c47a4f77ba485d6af3a0635db2ed8c4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169207
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/cui/qa/uitest/dialogs/shortcuts.py
b/cui/qa/uitest/dialogs/shortcuts.py
index 947d94b910d7..ac8a0a791496 100644
--- a/cui/qa/uitest/dialogs/shortcuts.py
+++ b/cui/qa/uitest/dialogs/shortcuts.py
@@ -13,18 +13,25 @@ from uitest.uihelper.common import get_state_as_dict
class Test(UITestCase):
def test_tab_navigation(self):
- with self.ui_test.create_doc_in_start_center("writer"),\
- self.ui_test.execute_dialog_through_command(".uno:EditStyle")
as xDialog:
- xTabs = xDialog.getChild("tabcontrol")
- select_pos(xTabs, "0")
-
- for i in range(16):
- self.assertEqual(get_state_as_dict(xTabs)["CurrPagePos"],
str(i))
- xTabs.executeAction("TYPE",
mkPropertyValues({"KEYCODE":"CTRL+PAGEDOWN"}))
-
- for i in reversed(range(16)):
- self.assertEqual(get_state_as_dict(xTabs)["CurrPagePos"],
str(i))
- xTabs.executeAction("TYPE",
mkPropertyValues({"KEYCODE":"CTRL+PAGEUP"}))
+ with self.ui_test.create_doc_in_start_center("writer"):
+ xWriterDoc = self.xUITest.getTopFocusWindow()
+
+ with self.ui_test.execute_dialog_through_command(".uno:EditStyle")
as xDialog:
+
+ xTabs = xDialog.getChild("tabcontrol")
+ select_pos(xTabs, "0")
+
+ for i in range(16):
+ self.assertEqual(get_state_as_dict(xTabs)["CurrPagePos"],
str(i))
+
+ xTabs.executeAction("TYPE",
mkPropertyValues({"KEYCODE":"CTRL+PAGEDOWN"}))
+
+ self.assertEqual(get_state_as_dict(xTabs)["CurrPagePos"], "0")
+
+ for i in reversed(range(16)):
+ xTabs.executeAction("TYPE",
mkPropertyValues({"KEYCODE":"CTRL+PAGEUP"}))
+
+ self.assertEqual(get_state_as_dict(xTabs)["CurrPagePos"],
str(i))
diff --git a/sc/uiconfig/scalc/ui/drawtemplatedialog.ui
b/sc/uiconfig/scalc/ui/drawtemplatedialog.ui
index 7a2881c3bd35..c812d786e910 100644
--- a/sc/uiconfig/scalc/ui/drawtemplatedialog.ui
+++ b/sc/uiconfig/scalc/ui/drawtemplatedialog.ui
@@ -106,7 +106,6 @@
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="tab-pos">left</property>
<property name="scrollable">True</property>
<property name="enable-popup">True</property>
<child>
diff --git a/sc/uiconfig/scalc/ui/formatcellsdialog.ui
b/sc/uiconfig/scalc/ui/formatcellsdialog.ui
index d4104ef99913..ea0daf8e9fd5 100644
--- a/sc/uiconfig/scalc/ui/formatcellsdialog.ui
+++ b/sc/uiconfig/scalc/ui/formatcellsdialog.ui
@@ -92,7 +92,6 @@
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="tab-pos">left</property>
<property name="scrollable">True</property>
<property name="enable-popup">True</property>
<child>
diff --git a/sc/uiconfig/scalc/ui/pagetemplatedialog.ui
b/sc/uiconfig/scalc/ui/pagetemplatedialog.ui
index 41caaf10d788..886c8b686099 100644
--- a/sc/uiconfig/scalc/ui/pagetemplatedialog.ui
+++ b/sc/uiconfig/scalc/ui/pagetemplatedialog.ui
@@ -107,7 +107,6 @@
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="tab-pos">left</property>
<property name="scrollable">True</property>
<property name="enable-popup">True</property>
<child>
diff --git a/sc/uiconfig/scalc/ui/paratemplatedialog.ui
b/sc/uiconfig/scalc/ui/paratemplatedialog.ui
index 1b72bd1d9132..dec4cbacce64 100644
--- a/sc/uiconfig/scalc/ui/paratemplatedialog.ui
+++ b/sc/uiconfig/scalc/ui/paratemplatedialog.ui
@@ -106,7 +106,6 @@
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="tab-pos">left</property>
<property name="scrollable">True</property>
<property name="enable-popup">True</property>
<child>
diff --git a/sd/uiconfig/simpress/ui/templatedialog.ui
b/sd/uiconfig/simpress/ui/templatedialog.ui
index b08c242463ca..4653b42a24cc 100644
--- a/sd/uiconfig/simpress/ui/templatedialog.ui
+++ b/sd/uiconfig/simpress/ui/templatedialog.ui
@@ -106,7 +106,6 @@
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="tab-pos">left</property>
<property name="scrollable">True</property>
<property name="enable-popup">True</property>
<child>
diff --git a/sw/uiconfig/swriter/ui/framedialog.ui
b/sw/uiconfig/swriter/ui/framedialog.ui
index 7e8979f0f451..795e2646f047 100644
--- a/sw/uiconfig/swriter/ui/framedialog.ui
+++ b/sw/uiconfig/swriter/ui/framedialog.ui
@@ -92,7 +92,6 @@
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="tab-pos">left</property>
<property name="scrollable">True</property>
<property name="enable-popup">True</property>
<child>
diff --git a/sw/uiconfig/swriter/ui/templatedialog1.ui
b/sw/uiconfig/swriter/ui/templatedialog1.ui
index acf3f3c141ba..544010bd34f8 100644
--- a/sw/uiconfig/swriter/ui/templatedialog1.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog1.ui
@@ -127,7 +127,6 @@
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="tab-pos">left</property>
<property name="scrollable">True</property>
<property name="enable-popup">True</property>
<child>
diff --git a/sw/uiconfig/swriter/ui/templatedialog16.ui
b/sw/uiconfig/swriter/ui/templatedialog16.ui
index 8c8ff4799606..2801767e7215 100644
--- a/sw/uiconfig/swriter/ui/templatedialog16.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog16.ui
@@ -122,7 +122,6 @@
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="tab-pos">left</property>
<property name="scrollable">True</property>
<property name="enable-popup">True</property>
<child>
diff --git a/sw/uiconfig/swriter/ui/templatedialog2.ui
b/sw/uiconfig/swriter/ui/templatedialog2.ui
index ae467d56a486..97fde7653f39 100644
--- a/sw/uiconfig/swriter/ui/templatedialog2.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog2.ui
@@ -122,7 +122,6 @@
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="tab-pos">left</property>
<property name="scrollable">True</property>
<property name="enable-popup">True</property>
<child>
diff --git a/sw/uiconfig/swriter/ui/templatedialog4.ui
b/sw/uiconfig/swriter/ui/templatedialog4.ui
index 0df01f60d447..8eed23043236 100644
--- a/sw/uiconfig/swriter/ui/templatedialog4.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog4.ui
@@ -122,7 +122,6 @@
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="tab-pos">left</property>
<property name="scrollable">True</property>
<property name="enable-popup">True</property>
<child>
diff --git a/sw/uiconfig/swriter/ui/templatedialog8.ui
b/sw/uiconfig/swriter/ui/templatedialog8.ui
index a9510e9d842f..0d4e4fee0b5a 100644
--- a/sw/uiconfig/swriter/ui/templatedialog8.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog8.ui
@@ -122,7 +122,6 @@
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="tab-pos">left</property>
<property name="scrollable">True</property>
<property name="enable-popup">True</property>
<child>
diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx
index a52a8634ff4b..dca91c7d4163 100644
--- a/vcl/source/control/imivctl1.cxx
+++ b/vcl/source/control/imivctl1.cxx
@@ -220,8 +220,6 @@ void SvxIconChoiceCtrl_Impl::RemoveEntry(size_t nPos)
{
pImpCursor->Clear();
maEntries.erase(maEntries.begin() + nPos);
- // Recalculate list positions
- nFlags &= ~IconChoiceFlags::EntryListPosValid;
RecalcAllBoundingRectsSmart();
}
