cui/inc/bitmaps.hlst | 12 +
cui/source/tabpages/border.cxx | 106 ++++++++-----
icon-themes/colibre/svx/res/border_cell_all_32.png |binary
icon-themes/colibre/svx/res/border_cell_diag_32.png |binary
icon-themes/colibre/svx/res/border_cell_l_32.png |binary
icon-themes/colibre/svx/res/border_cell_lr_32.png |binary
icon-themes/colibre/svx/res/border_cell_none_32.png |binary
icon-themes/colibre/svx/res/border_cell_tb_32.png |binary
icon-themes/colibre/svx/res/shadow_bottom_left_32.png |binary
icon-themes/colibre/svx/res/shadow_bottom_right_32.png |binary
icon-themes/colibre/svx/res/shadow_none_32.png |binary
icon-themes/colibre/svx/res/shadow_top_left_32.png |binary
icon-themes/colibre/svx/res/shadow_top_right_32.png |binary
icon-themes/colibre_svg/svx/res/border_cell_all_32.svg | 4
icon-themes/colibre_svg/svx/res/border_cell_diag_32.svg | 6
icon-themes/colibre_svg/svx/res/border_cell_l_32.svg | 7
icon-themes/colibre_svg/svx/res/border_cell_lr_32.svg | 8
icon-themes/colibre_svg/svx/res/border_cell_none_32.svg | 4
icon-themes/colibre_svg/svx/res/border_cell_tb_32.svg | 7
icon-themes/colibre_svg/svx/res/shadow_bottom_left_32.svg | 8
icon-themes/colibre_svg/svx/res/shadow_bottom_right_32.svg | 8
icon-themes/colibre_svg/svx/res/shadow_none_32.svg | 7
icon-themes/colibre_svg/svx/res/shadow_top_left_32.svg | 8
icon-themes/colibre_svg/svx/res/shadow_top_right_32.svg | 8
icon-themes/galaxy/svx/res/border_cell_all_32.png |binary
icon-themes/galaxy/svx/res/border_cell_diag_32.png |binary
icon-themes/galaxy/svx/res/border_cell_l_32.png |binary
icon-themes/galaxy/svx/res/border_cell_lr_32.png |binary
icon-themes/galaxy/svx/res/border_cell_none_32.png |binary
icon-themes/galaxy/svx/res/border_cell_tb_32.png |binary
icon-themes/galaxy/svx/res/shadow_bottom_left_32.png |binary
icon-themes/galaxy/svx/res/shadow_bottom_right_32.png |binary
icon-themes/galaxy/svx/res/shadow_none_32.png |binary
icon-themes/galaxy/svx/res/shadow_top_left_32.png |binary
icon-themes/galaxy/svx/res/shadow_top_right_32.png |binary
include/vcl/settings.hxx | 1
vcl/Package_theme_definitions.mk | 84 +++++-----
vcl/inc/listbox.hxx | 4
vcl/inc/svdata.hxx | 2
vcl/source/app/settings.cxx | 5
vcl/source/control/imp_listbox.cxx | 54 ++++--
vcl/source/control/listbox.cxx | 4
vcl/source/gdi/FileDefinitionWidgetDraw.cxx | 2
vcl/uiconfig/theme_definitions/ios/definition.xml | 102 ++++++------
44 files changed, 303 insertions(+), 148 deletions(-)
New commits:
commit 14cc2832138d8a1169827f3feabc110b94c47664
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Mon Apr 1 13:08:02 2019 +0900
Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Mon Apr 1 16:45:48 2019 +0900
tdf#124150 increase size of color valueset widget
Size of the color value set can be set through settings, but there
was no setter. Added a setter and set it to a bigger value so it
is better suited for touch.
Change-Id: I8c9b17f7379c4702b0faf7847f1e6292cd89b0d0
Reviewed-on: https://gerrit.libreoffice.org/70031
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
(cherry picked from commit c2108dd683ec7ff0bcaac8456c6cce9610a2993a)
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 494e2bb8f24f..f8e464b375f9 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -593,6 +593,7 @@ public:
// be used.
sal_uInt16 GetColorValueSetMaximumRowCount() const;
+ void SetListBoxPreviewDefaultLogicSize(Size
const & rSize);
const Size& GetListBoxPreviewDefaultPixelSize() const;
// the default LineWidth for ListBox UI previews (LineStyle, LineDash,
LineStartEnd). Default is 1.
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index e2841b8b4ed2..890c774dce3f 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2045,6 +2045,11 @@ StyleSettings::operator !=( const StyleSettings& rSet )
const
return !(*this == rSet);
}
+void StyleSettings::SetListBoxPreviewDefaultLogicSize(Size const& rSize)
+{
+ mxData->maListBoxPreviewDefaultLogicSize = rSize;
+}
+
const Size& StyleSettings::GetListBoxPreviewDefaultPixelSize() const
{
if(0 == mxData->maListBoxPreviewDefaultPixelSize.Width() || 0 ==
mxData->maListBoxPreviewDefaultPixelSize.Height())
diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 5d2497aabcfc..f7b3da86eb79 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -929,6 +929,7 @@ bool FileDefinitionWidgetDraw::updateSettings(AllSettings&
rSettings)
aStyleSet.SetTitleHeight(16);
aStyleSet.SetFloatTitleHeight(12);
+ aStyleSet.SetListBoxPreviewDefaultLogicSize(Size(16, 16));
rSettings.SetStyleSettings(aStyleSet);
commit 37b992967ac9ffb75be34dea4dea6106b3f09732
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Sat Mar 30 00:13:05 2019 +0900
Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Mon Apr 1 16:45:23 2019 +0900
ios theme definition: file rename svgx -> svg
Change-Id: I9bebc4405185496b8243e6f7951a2a9f0b6559fb
Reviewed-on: https://gerrit.libreoffice.org/69932
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
(cherry picked from commit 45f975f8180f782cf71173a4526d17d6e74b9583)
diff --git a/vcl/Package_theme_definitions.mk b/vcl/Package_theme_definitions.mk
index 4bc54c6f73c7..8f551ebaa8ce 100644
--- a/vcl/Package_theme_definitions.mk
+++ b/vcl/Package_theme_definitions.mk
@@ -11,48 +11,48 @@ $(eval $(call
gb_Package_Package,vcl_theme_definitions,$(SRCDIR)/vcl/uiconfig/th
$(eval $(call
gb_Package_add_files_with_dir,vcl_theme_definitions,$(LIBO_SHARE_FOLDER)/theme_definitions,\
ios/definition.xml \
- ios/switch-off.svgx \
- ios/switch-off-disabled.svgx \
- ios/switch-off-pressed.svgx \
- ios/switch-on.svgx \
- ios/switch-on-pressed.svgx \
- ios/switch-on-disabled.svgx \
- ios/tick-off.svgx \
- ios/tick-off-disabled.svgx \
- ios/tick-off-pressed.svgx \
- ios/tick-on.svgx \
- ios/tick-on-pressed.svgx \
- ios/tick-on-disabled.svgx \
- ios/spinbox-left.svgx \
- ios/spinbox-left-pressed.svgx \
- ios/spinbox-left-rollover.svgx \
- ios/spinbox-left-disabled.svgx \
- ios/spinbox-right.svgx \
- ios/spinbox-right-pressed.svgx \
- ios/spinbox-right-rollover.svgx \
- ios/spinbox-right-disabled.svgx \
- ios/common-rect.svgx \
- ios/common-rect-disabled.svgx \
- ios/common-rect-focus.svgx \
- ios/common-rect-focus-slim.svgx \
- ios/pushbutton-default.svgx \
- ios/pushbutton-rollover.svgx \
- ios/pushbutton-disabled.svgx \
- ios/tabitem-first.svgx \
- ios/tabitem-middle.svgx \
- ios/tabitem-last.svgx \
- ios/tabitem-first-selected.svgx \
- ios/tabitem-middle-selected.svgx \
- ios/tabitem-last-selected.svgx \
- ios/scrollbar-horizontal.svgx \
- ios/scrollbar-vertical.svgx \
- ios/combobox.svgx \
- ios/combobox-disabled.svgx \
- ios/combobox-button.svgx \
- ios/combobox-button-disabled.svgx \
- ios/arrow-up.svgx \
- ios/arrow-down.svgx \
- ios/slider-button.svgx \
+ ios/switch-off.svg \
+ ios/switch-off-disabled.svg \
+ ios/switch-off-pressed.svg \
+ ios/switch-on.svg \
+ ios/switch-on-pressed.svg \
+ ios/switch-on-disabled.svg \
+ ios/tick-off.svg \
+ ios/tick-off-disabled.svg \
+ ios/tick-off-pressed.svg \
+ ios/tick-on.svg \
+ ios/tick-on-pressed.svg \
+ ios/tick-on-disabled.svg \
+ ios/spinbox-left.svg \
+ ios/spinbox-left-pressed.svg \
+ ios/spinbox-left-rollover.svg \
+ ios/spinbox-left-disabled.svg \
+ ios/spinbox-right.svg \
+ ios/spinbox-right-pressed.svg \
+ ios/spinbox-right-rollover.svg \
+ ios/spinbox-right-disabled.svg \
+ ios/common-rect.svg \
+ ios/common-rect-disabled.svg \
+ ios/common-rect-focus.svg \
+ ios/common-rect-focus-slim.svg \
+ ios/pushbutton-default.svg \
+ ios/pushbutton-rollover.svg \
+ ios/pushbutton-disabled.svg \
+ ios/tabitem-first.svg \
+ ios/tabitem-middle.svg \
+ ios/tabitem-last.svg \
+ ios/tabitem-first-selected.svg \
+ ios/tabitem-middle-selected.svg \
+ ios/tabitem-last-selected.svg \
+ ios/scrollbar-horizontal.svg \
+ ios/scrollbar-vertical.svg \
+ ios/combobox.svg \
+ ios/combobox-disabled.svg \
+ ios/combobox-button.svg \
+ ios/combobox-button-disabled.svg \
+ ios/arrow-up.svg \
+ ios/arrow-down.svg \
+ ios/slider-button.svg \
))
# vim: set noet sw=4 ts=4:
diff --git a/vcl/uiconfig/theme_definitions/ios/arrow-down.svgx
b/vcl/uiconfig/theme_definitions/ios/arrow-down.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/arrow-down.svgx
rename to vcl/uiconfig/theme_definitions/ios/arrow-down.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/arrow-up.svgx
b/vcl/uiconfig/theme_definitions/ios/arrow-up.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/arrow-up.svgx
rename to vcl/uiconfig/theme_definitions/ios/arrow-up.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/combobox-button-disabled.svgx
b/vcl/uiconfig/theme_definitions/ios/combobox-button-disabled.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/combobox-button-disabled.svgx
rename to vcl/uiconfig/theme_definitions/ios/combobox-button-disabled.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/combobox-button.svgx
b/vcl/uiconfig/theme_definitions/ios/combobox-button.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/combobox-button.svgx
rename to vcl/uiconfig/theme_definitions/ios/combobox-button.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/combobox-disabled.svgx
b/vcl/uiconfig/theme_definitions/ios/combobox-disabled.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/combobox-disabled.svgx
rename to vcl/uiconfig/theme_definitions/ios/combobox-disabled.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/combobox.svgx
b/vcl/uiconfig/theme_definitions/ios/combobox.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/combobox.svgx
rename to vcl/uiconfig/theme_definitions/ios/combobox.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/common-rect-disabled.svgx
b/vcl/uiconfig/theme_definitions/ios/common-rect-disabled.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/common-rect-disabled.svgx
rename to vcl/uiconfig/theme_definitions/ios/common-rect-disabled.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/common-rect-focus-slim.svgx
b/vcl/uiconfig/theme_definitions/ios/common-rect-focus-slim.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/common-rect-focus-slim.svgx
rename to vcl/uiconfig/theme_definitions/ios/common-rect-focus-slim.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/common-rect-focus.svgx
b/vcl/uiconfig/theme_definitions/ios/common-rect-focus.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/common-rect-focus.svgx
rename to vcl/uiconfig/theme_definitions/ios/common-rect-focus.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/common-rect.svgx
b/vcl/uiconfig/theme_definitions/ios/common-rect.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/common-rect.svgx
rename to vcl/uiconfig/theme_definitions/ios/common-rect.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/definition.xml
b/vcl/uiconfig/theme_definitions/ios/definition.xml
index 9447d7678e0a..0f0823193857 100644
--- a/vcl/uiconfig/theme_definitions/ios/definition.xml
+++ b/vcl/uiconfig/theme_definitions/ios/definition.xml
@@ -68,18 +68,18 @@
<pushbutton>
<part value="Entire">
<state enabled="true">
- <external source="pushbutton-default.svgx" />
+ <external source="pushbutton-default.svg" />
</state>
<state enabled="true" rollover="true">
- <external source="pushbutton-rollover.svgx" />
+ <external source="pushbutton-rollover.svg" />
</state>
<state enabled="false">
- <external source="pushbutton-disabled.svgx" />
+ <external source="pushbutton-disabled.svg" />
</state>
</part>
<part value="Focus">
<state>
- <external source="common-rect-focus.svgx" />
+ <external source="common-rect-focus.svg" />
</state>
</part>
</pushbutton>
@@ -87,27 +87,27 @@
<radiobutton>
<part value="Entire" width="32" height="32">
<state enabled="true" pressed="false" button-value="true">
- <image source="tick-on.svgx" />
+ <image source="tick-on.svg" />
</state>
<state enabled="true" pressed="true" button-value="true">
- <image source="tick-on-pressed.svgx" />
+ <image source="tick-on-pressed.svg" />
</state>
<state enabled="false" button-value="true">
- <image source="tick-on-disabled.svgx" />
+ <image source="tick-on-disabled.svg" />
</state>
<state enabled="true" pressed="false" button-value="false">
- <image source="tick-off.svgx" />
+ <image source="tick-off.svg" />
</state>
<state enabled="true" pressed="true" button-value="false">
- <image source="tick-off-pressed.svgx" />
+ <image source="tick-off-pressed.svg" />
</state>
<state enabled="false" button-value="false">
- <image source="tick-on-disabled.svgx" />
+ <image source="tick-on-disabled.svg" />
</state>
</part>
<part value="Focus">
<state>
- <external source="common-rect-focus-slim.svgx" />
+ <external source="common-rect-focus-slim.svg" />
</state>
</part>
</radiobutton>
@@ -115,27 +115,27 @@
<checkbox>
<part value="Entire" width="44" height="26">
<state enabled="true" pressed="false" button-value="true">
- <image source="switch-on.svgx" />
+ <image source="switch-on.svg" />
</state>
<state enabled="true" pressed="true" button-value="true">
- <image source="switch-on-pressed.svgx" />
+ <image source="switch-on-pressed.svg" />
</state>
<state enabled="false" button-value="true">
- <image source="switch-on-disabled.svgx" />
+ <image source="switch-on-disabled.svg" />
</state>
<state enabled="true" pressed="false" button-value="false">
- <image source="switch-off.svgx" />
+ <image source="switch-off.svg" />
</state>
<state enabled="true" pressed="true" button-value="false">
- <image source="switch-off-pressed.svgx" />
+ <image source="switch-off-pressed.svg" />
</state>
<state enabled="false" button-value="false">
- <image source="switch-on-disabled.svgx" />
+ <image source="switch-on-disabled.svg" />
</state>
</part>
<part value="Focus">
<state>
- <external source="common-rect-focus-slim.svgx" />
+ <external source="common-rect-focus-slim.svg" />
</state>
</part>
</checkbox>
@@ -143,10 +143,10 @@
<combobox>
<part value="Entire">
<state enabled="true">
- <external source="combobox.svgx" />
+ <external source="combobox.svg" />
</state>
<state enabled="false">
- <external source="combobox-disabled.svgx" />
+ <external source="combobox-disabled.svg" />
</state>
</part>
<part value="SubEdit">
@@ -155,15 +155,15 @@
</part>
<part value="ButtonDown" width="35" height="36">
<state enabled="true">
- <image source="combobox-button.svgx" />
+ <image source="combobox-button.svg" />
</state>
<state enabled="false">
- <image source="combobox-button-disabled.svgx" />
+ <image source="combobox-button-disabled.svg" />
</state>
</part>
<part value="Focus">
<state>
- <external source="common-rect-focus.svgx" />
+ <external source="common-rect-focus.svg" />
</state>
</part>
</combobox>
@@ -171,13 +171,13 @@
<editbox>
<part value="Entire" height="32">
<state enabled="true">
- <external source="common-rect.svgx" />
+ <external source="common-rect.svg" />
</state>
<state enabled="false">
- <external source="common-rect-disabled.svgx" />
+ <external source="common-rect-disabled.svg" />
</state>
<state focused="true">
- <external source="common-rect-focus.svgx" />
+ <external source="common-rect-focus.svg" />
</state>
</part>
</editbox>
@@ -185,10 +185,10 @@
<listbox>
<part value="Entire">
<state enabled="true">
- <external source="combobox.svgx" />
+ <external source="combobox.svg" />
</state>
<state enabled="false">
- <external source="combobox-disabled.svgx" />
+ <external source="combobox-disabled.svg" />
</state>
</part>
<part value="SubEdit">
@@ -197,15 +197,15 @@
</part>
<part value="ButtonDown" width="35" height="36">
<state enabled="true">
- <image source="combobox-button.svgx" />
+ <image source="combobox-button.svg" />
</state>
<state enabled="false">
- <image source="combobox-button-disabled.svgx" />
+ <image source="combobox-button-disabled.svg" />
</state>
</part>
<part value="Focus">
<state>
- <external source="common-rect-focus.svgx" />
+ <external source="common-rect-focus.svg" />
</state>
</part>
</listbox>
@@ -219,35 +219,35 @@
</part>
<part value="ButtonDown" width="44" height="26">
<state enabled="true">
- <external source="spinbox-left.svgx" />
+ <external source="spinbox-left.svg" />
</state>
<state enabled="true" pressed="true">
- <external source="spinbox-left-pressed.svgx" />
+ <external source="spinbox-left-pressed.svg" />
</state>
<state enabled="true" rollover="true">
- <external source="spinbox-left-rollover.svgx" />
+ <external source="spinbox-left-rollover.svg" />
</state>
<state enabled="false">
- <external source="spinbox-left-disabled.svgx" />
+ <external source="spinbox-left-disabled.svg" />
</state>
</part>
<part value="ButtonUp" width="44" height="26">
<state enabled="true">
- <external source="spinbox-right.svgx" />
+ <external source="spinbox-right.svg" />
</state>
<state enabled="true" pressed="true">
- <external source="spinbox-right-pressed.svgx" />
+ <external source="spinbox-right-pressed.svg" />
</state>
<state enabled="true" rollover="true">
- <external source="spinbox-right-rollover.svgx" />
+ <external source="spinbox-right-rollover.svg" />
</state>
<state enabled="false">
- <external source="spinbox-right-disabled.svgx" />
+ <external source="spinbox-right-disabled.svg" />
</state>
</part>
<part value="Focus">
<state>
- <external source="common-rect-focus-slim.svgx" />
+ <external source="common-rect-focus-slim.svg" />
</state>
</part>
</spinbox>
@@ -255,12 +255,12 @@
<scrollbar>
<part value="ThumbHorz">
<state>
- <external source="scrollbar-horizontal.svgx" />
+ <external source="scrollbar-horizontal.svg" />
</state>
</part>
<part value="ThumbVert">
<state>
- <external source="scrollbar-vertical.svgx" />
+ <external source="scrollbar-vertical.svg" />
</state>
</part>
<part value="ButtonUp">
@@ -296,7 +296,7 @@
<slider>
<part value="Button">
<state>
- <image source="slider-button.svgx" />
+ <image source="slider-button.svg" />
</state>
</part>
<part value="TrackHorzLeft">
@@ -345,22 +345,22 @@
<tabitem>
<part value="Entire" margin-width="8" height="32">
<state selected="false" extra="first">
- <external source="tabitem-first.svgx" />
+ <external source="tabitem-first.svg" />
</state>
<state selected="false" extra="middle">
- <external source="tabitem-middle.svgx" />
+ <external source="tabitem-middle.svg" />
</state>
<state selected="false" extra="last">
- <external source="tabitem-last.svgx" />
+ <external source="tabitem-last.svg" />
</state>
<state selected="true" extra="first">
- <external source="tabitem-first-selected.svgx" />
+ <external source="tabitem-first-selected.svg" />
</state>
<state selected="true" extra="middle">
- <external source="tabitem-middle-selected.svgx" />
+ <external source="tabitem-middle-selected.svg" />
</state>
<state selected="true" extra="last">
- <external source="tabitem-last-selected.svgx" />
+ <external source="tabitem-last-selected.svg" />
</state>
</part>
</tabitem>
@@ -470,10 +470,10 @@
</part>
<part value="Arrow">
<state extra="up">
- <image source="arrow-up.svgx"/>
+ <image source="arrow-up.svg"/>
</state>
<state extra="down">
- <image source="arrow-down.svgx"/>
+ <image source="arrow-down.svg"/>
</state>
</part>
</listheader>
diff --git a/vcl/uiconfig/theme_definitions/ios/pushbutton-default.svgx
b/vcl/uiconfig/theme_definitions/ios/pushbutton-default.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/pushbutton-default.svgx
rename to vcl/uiconfig/theme_definitions/ios/pushbutton-default.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/pushbutton-disabled.svgx
b/vcl/uiconfig/theme_definitions/ios/pushbutton-disabled.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/pushbutton-disabled.svgx
rename to vcl/uiconfig/theme_definitions/ios/pushbutton-disabled.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/pushbutton-rollover.svgx
b/vcl/uiconfig/theme_definitions/ios/pushbutton-rollover.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/pushbutton-rollover.svgx
rename to vcl/uiconfig/theme_definitions/ios/pushbutton-rollover.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/scrollbar-horizontal.svgx
b/vcl/uiconfig/theme_definitions/ios/scrollbar-horizontal.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/scrollbar-horizontal.svgx
rename to vcl/uiconfig/theme_definitions/ios/scrollbar-horizontal.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/scrollbar-vertical.svgx
b/vcl/uiconfig/theme_definitions/ios/scrollbar-vertical.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/scrollbar-vertical.svgx
rename to vcl/uiconfig/theme_definitions/ios/scrollbar-vertical.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/slider-button.svgx
b/vcl/uiconfig/theme_definitions/ios/slider-button.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/slider-button.svgx
rename to vcl/uiconfig/theme_definitions/ios/slider-button.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svgx
b/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svgx
rename to vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svgx
b/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svgx
rename to vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-left-rollover.svgx
b/vcl/uiconfig/theme_definitions/ios/spinbox-left-rollover.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/spinbox-left-rollover.svgx
rename to vcl/uiconfig/theme_definitions/ios/spinbox-left-rollover.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-left.svgx
b/vcl/uiconfig/theme_definitions/ios/spinbox-left.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/spinbox-left.svgx
rename to vcl/uiconfig/theme_definitions/ios/spinbox-left.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-right-disabled.svgx
b/vcl/uiconfig/theme_definitions/ios/spinbox-right-disabled.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/spinbox-right-disabled.svgx
rename to vcl/uiconfig/theme_definitions/ios/spinbox-right-disabled.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-right-pressed.svgx
b/vcl/uiconfig/theme_definitions/ios/spinbox-right-pressed.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/spinbox-right-pressed.svgx
rename to vcl/uiconfig/theme_definitions/ios/spinbox-right-pressed.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-right-rollover.svgx
b/vcl/uiconfig/theme_definitions/ios/spinbox-right-rollover.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/spinbox-right-rollover.svgx
rename to vcl/uiconfig/theme_definitions/ios/spinbox-right-rollover.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-right.svgx
b/vcl/uiconfig/theme_definitions/ios/spinbox-right.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/spinbox-right.svgx
rename to vcl/uiconfig/theme_definitions/ios/spinbox-right.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/switch-off-disabled.svgx
b/vcl/uiconfig/theme_definitions/ios/switch-off-disabled.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/switch-off-disabled.svgx
rename to vcl/uiconfig/theme_definitions/ios/switch-off-disabled.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/switch-off-pressed.svgx
b/vcl/uiconfig/theme_definitions/ios/switch-off-pressed.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/switch-off-pressed.svgx
rename to vcl/uiconfig/theme_definitions/ios/switch-off-pressed.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/switch-off.svgx
b/vcl/uiconfig/theme_definitions/ios/switch-off.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/switch-off.svgx
rename to vcl/uiconfig/theme_definitions/ios/switch-off.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/switch-on-disabled.svgx
b/vcl/uiconfig/theme_definitions/ios/switch-on-disabled.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/switch-on-disabled.svgx
rename to vcl/uiconfig/theme_definitions/ios/switch-on-disabled.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/switch-on-pressed.svgx
b/vcl/uiconfig/theme_definitions/ios/switch-on-pressed.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/switch-on-pressed.svgx
rename to vcl/uiconfig/theme_definitions/ios/switch-on-pressed.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/switch-on.svgx
b/vcl/uiconfig/theme_definitions/ios/switch-on.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/switch-on.svgx
rename to vcl/uiconfig/theme_definitions/ios/switch-on.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/tabitem-first-selected.svgx
b/vcl/uiconfig/theme_definitions/ios/tabitem-first-selected.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/tabitem-first-selected.svgx
rename to vcl/uiconfig/theme_definitions/ios/tabitem-first-selected.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/tabitem-first.svgx
b/vcl/uiconfig/theme_definitions/ios/tabitem-first.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/tabitem-first.svgx
rename to vcl/uiconfig/theme_definitions/ios/tabitem-first.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/tabitem-last-selected.svgx
b/vcl/uiconfig/theme_definitions/ios/tabitem-last-selected.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/tabitem-last-selected.svgx
rename to vcl/uiconfig/theme_definitions/ios/tabitem-last-selected.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/tabitem-last.svgx
b/vcl/uiconfig/theme_definitions/ios/tabitem-last.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/tabitem-last.svgx
rename to vcl/uiconfig/theme_definitions/ios/tabitem-last.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/tabitem-middle-selected.svgx
b/vcl/uiconfig/theme_definitions/ios/tabitem-middle-selected.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/tabitem-middle-selected.svgx
rename to vcl/uiconfig/theme_definitions/ios/tabitem-middle-selected.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/tabitem-middle.svgx
b/vcl/uiconfig/theme_definitions/ios/tabitem-middle.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/tabitem-middle.svgx
rename to vcl/uiconfig/theme_definitions/ios/tabitem-middle.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/tick-off-disabled.svgx
b/vcl/uiconfig/theme_definitions/ios/tick-off-disabled.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/tick-off-disabled.svgx
rename to vcl/uiconfig/theme_definitions/ios/tick-off-disabled.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/tick-off-pressed.svgx
b/vcl/uiconfig/theme_definitions/ios/tick-off-pressed.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/tick-off-pressed.svgx
rename to vcl/uiconfig/theme_definitions/ios/tick-off-pressed.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/tick-off.svgx
b/vcl/uiconfig/theme_definitions/ios/tick-off.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/tick-off.svgx
rename to vcl/uiconfig/theme_definitions/ios/tick-off.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/tick-on-disabled.svgx
b/vcl/uiconfig/theme_definitions/ios/tick-on-disabled.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/tick-on-disabled.svgx
rename to vcl/uiconfig/theme_definitions/ios/tick-on-disabled.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/tick-on-pressed.svgx
b/vcl/uiconfig/theme_definitions/ios/tick-on-pressed.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/tick-on-pressed.svgx
rename to vcl/uiconfig/theme_definitions/ios/tick-on-pressed.svg
diff --git a/vcl/uiconfig/theme_definitions/ios/tick-on.svgx
b/vcl/uiconfig/theme_definitions/ios/tick-on.svg
similarity index 100%
rename from vcl/uiconfig/theme_definitions/ios/tick-on.svgx
rename to vcl/uiconfig/theme_definitions/ios/tick-on.svg
commit fa5f4a1d5fb2b04ee416dd72eb4aaf0b42ca5cba
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri Mar 29 22:08:34 2019 +0900
Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Mon Apr 1 16:44:34 2019 +0900
tdf#124149 add bigger 32px icons for border line and shadow
Reviewed-on: https://gerrit.libreoffice.org/69925
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
(cherry picked from commit 92990b12f900ac0a12ce006f63b8c3d0f09b6b2f)
Change-Id: I7ea382f3ba648657d2a6d009bf90dcc3be879c63
diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst
index dc1ce4a6a9e4..2d91b8e7fed3 100644
--- a/cui/inc/bitmaps.hlst
+++ b/cui/inc/bitmaps.hlst
@@ -11,11 +11,17 @@
#define INCLUDED_CUI_INC_BITMAPS_HRC
#define RID_SVXBMP_CELL_NONE "svx/res/pr01.png"
+#define RID_SVXBMP_CELL_NONE_32 "svx/res/border_cell_none_32.png"
#define RID_SVXBMP_CELL_ALL "svx/res/pr02.png"
+#define RID_SVXBMP_CELL_ALL_32 "svx/res/border_cell_all_32.png"
#define RID_SVXBMP_CELL_LR "svx/res/pr03.png"
+#define RID_SVXBMP_CELL_LR_32 "svx/res/border_cell_lr_32.png"
#define RID_SVXBMP_CELL_TB "svx/res/pr04.png"
+#define RID_SVXBMP_CELL_TB_32 "svx/res/border_cell_tb_32.png"
#define RID_SVXBMP_CELL_L "svx/res/pr05.png"
+#define RID_SVXBMP_CELL_L_32 "svx/res/border_cell_l_32.png"
#define RID_SVXBMP_CELL_DIAG "svx/res/pr06.png"
+#define RID_SVXBMP_CELL_DIAG_32 "svx/res/border_cell_diag_32.png"
#define RID_SVXBMP_HOR_NONE "svx/res/pr07.png"
#define RID_SVXBMP_HOR_OUTER "svx/res/pr08.png"
#define RID_SVXBMP_HOR_HOR "svx/res/pr09.png"
@@ -31,11 +37,17 @@
#define RID_SVXBMP_TABLE_OUTERH "svx/res/pr019.png"
#define RID_SVXBMP_TABLE_ALL "svx/res/pr020.png"
#define RID_SVXBMP_TABLE_OUTER2 "svx/res/pr021.png"
+
#define RID_SVXBMP_SHADOWNONE "svx/res/sh01.png"
+#define RID_SVXBMP_SHADOWNONE_32 "svx/res/shadow_none_32.png"
#define RID_SVXBMP_SHADOW_BOT_RIGHT "svx/res/sh02.png"
+#define RID_SVXBMP_SHADOW_BOT_RIGHT_32 "svx/res/shadow_bottom_right_32.png"
#define RID_SVXBMP_SHADOW_BOT_LEFT "svx/res/sh03.png"
+#define RID_SVXBMP_SHADOW_BOT_LEFT_32 "svx/res/shadow_bottom_left_32.png"
#define RID_SVXBMP_SHADOW_TOP_RIGHT "svx/res/sh04.png"
+#define RID_SVXBMP_SHADOW_TOP_RIGHT_32 "svx/res/shadow_top_right_32.png"
#define RID_SVXBMP_SHADOW_TOP_LEFT "svx/res/sh05.png"
+#define RID_SVXBMP_SHADOW_TOP_LEFT_32 "svx/res/shadow_top_left_32.png"
#define RID_SVXBMP_BOTTOMLOCK "svx/res/lo01.png"
#define RID_SVXBMP_TOPLOCK "svx/res/lo02.png"
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index e1e3cbcad398..f20a8e9ee4b1 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -48,6 +48,7 @@
#include <sal/macros.h>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include "borderconn.hxx"
+#include <comphelper/lok.hxx>
using namespace ::editeng;
using ::com::sun::star::uno::Reference;
@@ -140,45 +141,82 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent,
const SfxItemSet& rCore
get(m_pRemoveAdjcentCellBordersCB, "rmadjcellborders");
get(m_pRemoveAdjcentCellBordersFT, "rmadjcellbordersft");
- static const OUStringLiteral pnBorderImgIds[] =
+ static std::vector<OUStringLiteral> aBorderImageIds;
+
+ if (aBorderImageIds.empty())
{
- RID_SVXBMP_CELL_NONE,
- RID_SVXBMP_CELL_ALL,
- RID_SVXBMP_CELL_LR,
- RID_SVXBMP_CELL_TB,
- RID_SVXBMP_CELL_L,
- RID_SVXBMP_CELL_DIAG,
- RID_SVXBMP_HOR_NONE,
- RID_SVXBMP_HOR_OUTER,
- RID_SVXBMP_HOR_HOR,
- RID_SVXBMP_HOR_ALL,
- RID_SVXBMP_HOR_OUTER2,
- RID_SVXBMP_VER_NONE,
- RID_SVXBMP_VER_OUTER,
- RID_SVXBMP_VER_VER,
- RID_SVXBMP_VER_ALL,
- RID_SVXBMP_VER_OUTER2,
- RID_SVXBMP_TABLE_NONE,
- RID_SVXBMP_TABLE_OUTER,
- RID_SVXBMP_TABLE_OUTERH,
- RID_SVXBMP_TABLE_ALL,
- RID_SVXBMP_TABLE_OUTER2
- };
+ if (comphelper::LibreOfficeKit::isActive())
+ {
+ aBorderImageIds.insert(aBorderImageIds.end(), {
+ RID_SVXBMP_CELL_NONE_32,
+ RID_SVXBMP_CELL_ALL_32,
+ RID_SVXBMP_CELL_LR_32,
+ RID_SVXBMP_CELL_TB_32,
+ RID_SVXBMP_CELL_L_32,
+ RID_SVXBMP_CELL_DIAG_32
+ });
+ }
+ else
+ {
+ aBorderImageIds.insert(aBorderImageIds.end(), {
+ RID_SVXBMP_CELL_NONE,
+ RID_SVXBMP_CELL_ALL,
+ RID_SVXBMP_CELL_LR,
+ RID_SVXBMP_CELL_TB,
+ RID_SVXBMP_CELL_L,
+ RID_SVXBMP_CELL_DIAG
+ });
+ }
+ aBorderImageIds.insert(aBorderImageIds.end(), {
+ RID_SVXBMP_HOR_NONE,
+ RID_SVXBMP_HOR_OUTER,
+ RID_SVXBMP_HOR_HOR,
+ RID_SVXBMP_HOR_ALL,
+ RID_SVXBMP_HOR_OUTER2,
+ RID_SVXBMP_VER_NONE,
+ RID_SVXBMP_VER_OUTER,
+ RID_SVXBMP_VER_VER,
+ RID_SVXBMP_VER_ALL,
+ RID_SVXBMP_VER_OUTER2,
+ RID_SVXBMP_TABLE_NONE,
+ RID_SVXBMP_TABLE_OUTER,
+ RID_SVXBMP_TABLE_OUTERH,
+ RID_SVXBMP_TABLE_ALL,
+ RID_SVXBMP_TABLE_OUTER2
+ });
+ }
- for (size_t i = 0; i < SAL_N_ELEMENTS(pnBorderImgIds); ++i)
- m_aBorderImgVec.emplace_back(pnBorderImgIds[i]);
+ for (auto const & rImageId : aBorderImageIds)
+ m_aBorderImgVec.emplace_back(StockImage::Yes, rImageId);
- static const OUStringLiteral pnShadowImgIds[SVX_BORDER_SHADOW_COUNT] =
+ static std::vector<OUStringLiteral> aShadowImageIds;
+ if (aShadowImageIds.empty())
{
- RID_SVXBMP_SHADOWNONE,
- RID_SVXBMP_SHADOW_BOT_RIGHT,
- RID_SVXBMP_SHADOW_TOP_RIGHT,
- RID_SVXBMP_SHADOW_BOT_LEFT,
- RID_SVXBMP_SHADOW_TOP_LEFT
- };
+ if (comphelper::LibreOfficeKit::isActive())
+ {
+ aShadowImageIds.insert(aShadowImageIds.end(), {
+ RID_SVXBMP_SHADOWNONE_32,
+ RID_SVXBMP_SHADOW_BOT_RIGHT_32,
+ RID_SVXBMP_SHADOW_TOP_RIGHT_32,
+ RID_SVXBMP_SHADOW_BOT_LEFT_32,
+ RID_SVXBMP_SHADOW_TOP_LEFT_32
+ });
+ }
+ else
+ {
+ aShadowImageIds.insert(aShadowImageIds.end(), {
+ RID_SVXBMP_SHADOWNONE,
+ RID_SVXBMP_SHADOW_BOT_RIGHT,
+ RID_SVXBMP_SHADOW_TOP_RIGHT,
+ RID_SVXBMP_SHADOW_BOT_LEFT,
+ RID_SVXBMP_SHADOW_TOP_LEFT
+ });
+ }
+ }
+
+ for (auto const & rImageId : aShadowImageIds)
+ m_aShadowImgVec.emplace_back(StockImage::Yes, rImageId);
- for (size_t i = 0; i < SAL_N_ELEMENTS(pnShadowImgIds); ++i)
- m_aShadowImgVec.emplace_back(pnShadowImgIds[i]);
assert(m_aShadowImgVec.size() == SVX_BORDER_SHADOW_COUNT);
if ( GetDPIScaleFactor() > 1 )
diff --git a/icon-themes/colibre/svx/res/border_cell_all_32.png
b/icon-themes/colibre/svx/res/border_cell_all_32.png
new file mode 100644
index 000000000000..0d058ddffd97
Binary files /dev/null and b/icon-themes/colibre/svx/res/border_cell_all_32.png
differ
diff --git a/icon-themes/colibre/svx/res/border_cell_diag_32.png
b/icon-themes/colibre/svx/res/border_cell_diag_32.png
new file mode 100644
index 000000000000..6bc5a0bd114a
Binary files /dev/null and
b/icon-themes/colibre/svx/res/border_cell_diag_32.png differ
diff --git a/icon-themes/colibre/svx/res/border_cell_l_32.png
b/icon-themes/colibre/svx/res/border_cell_l_32.png
new file mode 100644
index 000000000000..5671a352a959
Binary files /dev/null and b/icon-themes/colibre/svx/res/border_cell_l_32.png
differ
diff --git a/icon-themes/colibre/svx/res/border_cell_lr_32.png
b/icon-themes/colibre/svx/res/border_cell_lr_32.png
new file mode 100644
index 000000000000..3dbad69f9c79
Binary files /dev/null and b/icon-themes/colibre/svx/res/border_cell_lr_32.png
differ
diff --git a/icon-themes/colibre/svx/res/border_cell_none_32.png
b/icon-themes/colibre/svx/res/border_cell_none_32.png
new file mode 100644
index 000000000000..956eeccaf82d
Binary files /dev/null and
b/icon-themes/colibre/svx/res/border_cell_none_32.png differ
diff --git a/icon-themes/colibre/svx/res/border_cell_tb_32.png
b/icon-themes/colibre/svx/res/border_cell_tb_32.png
new file mode 100644
index 000000000000..1d36fa6be45b
Binary files /dev/null and b/icon-themes/colibre/svx/res/border_cell_tb_32.png
differ
diff --git a/icon-themes/colibre/svx/res/shadow_bottom_left_32.png
b/icon-themes/colibre/svx/res/shadow_bottom_left_32.png
new file mode 100644
index 000000000000..36f4664586fa
Binary files /dev/null and
b/icon-themes/colibre/svx/res/shadow_bottom_left_32.png differ
diff --git a/icon-themes/colibre/svx/res/shadow_bottom_right_32.png
b/icon-themes/colibre/svx/res/shadow_bottom_right_32.png
new file mode 100644
index 000000000000..491edf21a428
Binary files /dev/null and
b/icon-themes/colibre/svx/res/shadow_bottom_right_32.png differ
diff --git a/icon-themes/colibre/svx/res/shadow_none_32.png
b/icon-themes/colibre/svx/res/shadow_none_32.png
new file mode 100644
index 000000000000..0fd56b62755a
Binary files /dev/null and b/icon-themes/colibre/svx/res/shadow_none_32.png
differ
diff --git a/icon-themes/colibre/svx/res/shadow_top_left_32.png
b/icon-themes/colibre/svx/res/shadow_top_left_32.png
new file mode 100644
index 000000000000..209f9c0d6f2b
Binary files /dev/null and b/icon-themes/colibre/svx/res/shadow_top_left_32.png
differ
diff --git a/icon-themes/colibre/svx/res/shadow_top_right_32.png
b/icon-themes/colibre/svx/res/shadow_top_right_32.png
new file mode 100644
index 000000000000..e7b1b1476d16
Binary files /dev/null and
b/icon-themes/colibre/svx/res/shadow_top_right_32.png differ
diff --git a/icon-themes/colibre_svg/svx/res/border_cell_all_32.svg
b/icon-themes/colibre_svg/svx/res/border_cell_all_32.svg
new file mode 100644
index 000000000000..256c545358ef
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/border_cell_all_32.svg
@@ -0,0 +1,4 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";>
+ <path d="m0 0v32h32v-32zm4.2667 4.2667h23.467v23.467h-23.467z" fill="#808080"
stroke-width="2.1333"/>
+ <path d="m4.2667 4.2667v23.467h23.467v-23.467z" fill="#808080" opacity=".4"
stroke-width="2.1333"/>
+</svg>
diff --git a/icon-themes/colibre_svg/svx/res/border_cell_diag_32.svg
b/icon-themes/colibre_svg/svx/res/border_cell_diag_32.svg
new file mode 100644
index 000000000000..953d725f2831
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/border_cell_diag_32.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";>
+ <path d="m4.282 4.2824h23.435v23.435h-23.435z" fill="#808080" opacity=".4"
stroke-width="2.1305"/>
+ <path d="m0.021016 0.02151v31.956h31.957v-31.956zm4.2609
4.2609h23.435v23.435h-23.435z" fill="#fff" stroke-width="2.1305"/>
+ <path d="m2.1515 29.848 27.696-27.696" fill="none" stroke="#808080"
stroke-linecap="round" stroke-linejoin="round" stroke-width="4.2609"/>
+ <path d="m29.848 29.848-27.696-27.696" fill="none" stroke="#808080"
stroke-linecap="round" stroke-linejoin="round" stroke-width="4.2609"/>
+</svg>
diff --git a/icon-themes/colibre_svg/svx/res/border_cell_l_32.svg
b/icon-themes/colibre_svg/svx/res/border_cell_l_32.svg
new file mode 100644
index 000000000000..b7a3b68fc6bf
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/border_cell_l_32.svg
@@ -0,0 +1,7 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";>
+ <g>
+ <path d="m4.2667-9e-7v4.2667h23.467v23.467h-23.467v4.2667h27.733v-32z"
fill="#fff"/>
+ <path d="m4.2667 4.2667v23.467h23.467v-23.467z" fill="#808080" opacity=".4"/>
+ <path d="m0-9e-7v32h4.2667v-32z" fill="#808080"/>
+ </g>
+</svg>
diff --git a/icon-themes/colibre_svg/svx/res/border_cell_lr_32.svg
b/icon-themes/colibre_svg/svx/res/border_cell_lr_32.svg
new file mode 100644
index 000000000000..38539c729d70
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/border_cell_lr_32.svg
@@ -0,0 +1,8 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";>
+ <path d="m4.2667-9e-7v4.2667h23.467v-4.2667zm0 27.733v4.2667h23.467v-4.2667z"
fill="#fff"/>
+ <g fill="#808080">
+ <path d="m4.2667 4.2667v23.467h23.467v-23.467z" opacity=".4"/>
+ <path d="m27.733-9e-7v32h4.2667v-32z"/>
+ <path d="m0-9e-7v32h4.2667v-32z"/>
+ </g>
+</svg>
diff --git a/icon-themes/colibre_svg/svx/res/border_cell_none_32.svg
b/icon-themes/colibre_svg/svx/res/border_cell_none_32.svg
new file mode 100644
index 000000000000..ad7f79b2e3bd
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/border_cell_none_32.svg
@@ -0,0 +1,4 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";>
+ <path d="m0 0v32h32v-32zm4.2667 4.2667h23.467v23.467h-23.467z" fill="#fff"
stroke-width="2.1333"/>
+ <path d="m4.2667 4.2667v23.467h23.467v-23.467z" fill="#808080" opacity=".4"
stroke-width="2.1333"/>
+</svg>
diff --git a/icon-themes/colibre_svg/svx/res/border_cell_tb_32.svg
b/icon-themes/colibre_svg/svx/res/border_cell_tb_32.svg
new file mode 100644
index 000000000000..0e2f4f757a6b
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/border_cell_tb_32.svg
@@ -0,0 +1,7 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";>
+ <g>
+ <path d="m0 4.2667v23.467h4.2667v-23.467zm27.733 0v23.467h4.2667v-23.467z"
fill="#fff"/>
+ <path d="m4.2667 4.2667v23.467h23.467v-23.467z" fill="#808080" opacity=".4"/>
+ <path d="m0-9e-7v4.2667h32v-4.2667zm0 27.733v4.2667h32v-4.2667z"
fill="#808080"/>
+ </g>
+</svg>
diff --git a/icon-themes/colibre_svg/svx/res/shadow_bottom_left_32.svg
b/icon-themes/colibre_svg/svx/res/shadow_bottom_left_32.svg
new file mode 100644
index 000000000000..63eab1c81666
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/shadow_bottom_left_32.svg
@@ -0,0 +1,8 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";>
+ <rect y="8" width="24" height="24" ry="2.1818" fill="#b8b8b8"
stroke-width="2.1818"/>
+ <g stroke-width="2">
+ <path d="m6 6v20h20v-20zm2 2h16v16h-16z" fill="#4d4d4d"/>
+ <path d="m6 4c-1.108 0-2 0.892-2 2v20c0 1.108 0.892 2 2 2h20c1.108 0 2-0.892
2-2v-20c0-1.108-0.892-2-2-2zm0 2h20v20h-20z" fill="#808080"/>
+ <path d="m6 6h20v20h-20z" fill="#fff"/>
+ </g>
+</svg>
diff --git a/icon-themes/colibre_svg/svx/res/shadow_bottom_right_32.svg
b/icon-themes/colibre_svg/svx/res/shadow_bottom_right_32.svg
new file mode 100644
index 000000000000..9b4c93513ba4
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/shadow_bottom_right_32.svg
@@ -0,0 +1,8 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";>
+ <rect x="8" y="8" width="24" height="24" ry="2.1818" fill="#b8b8b8"
stroke-width="2.1818"/>
+ <g stroke-width="2">
+ <path d="m6 6v20h20v-20zm2 2h16v16h-16z" fill="#4d4d4d"/>
+ <path d="m6 4c-1.108 0-2 0.892-2 2v20c0 1.108 0.892 2 2 2h20c1.108 0 2-0.892
2-2v-20c0-1.108-0.892-2-2-2zm0 2h20v20h-20z" fill="#808080"/>
+ <path d="m6 6h20v20h-20z" fill="#fff"/>
+ </g>
+</svg>
diff --git a/icon-themes/colibre_svg/svx/res/shadow_none_32.svg
b/icon-themes/colibre_svg/svx/res/shadow_none_32.svg
new file mode 100644
index 000000000000..380acb31dd96
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/shadow_none_32.svg
@@ -0,0 +1,7 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";>
+ <g transform="matrix(.85716 0 0 .85716 2.2857 2.2857)" stroke-width="2.3333">
+ <path d="m4.3333 4.3333v23.333h23.333v-23.333zm2.3333
2.3333h18.667v18.667h-18.667z" fill="#4d4d4d"/>
+ <path d="m4.3333 2c-1.2927 0-2.3333 1.0407-2.3333 2.3333v23.333c0 1.2927
1.0407 2.3333 2.3333 2.3333h23.333c1.2927 0 2.3333-1.0407
2.3333-2.3333v-23.333c0-1.2927-1.0407-2.3333-2.3333-2.3333zm0
2.3333h23.333v23.333h-23.333z" fill="#808080"/>
+ <path d="m4.3333 4.3333h23.333v23.333h-23.333z" fill="#fff"/>
+ </g>
+</svg>
diff --git a/icon-themes/colibre_svg/svx/res/shadow_top_left_32.svg
b/icon-themes/colibre_svg/svx/res/shadow_top_left_32.svg
new file mode 100644
index 000000000000..5057a85a9307
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/shadow_top_left_32.svg
@@ -0,0 +1,8 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";>
+ <rect width="24" height="24" ry="2.1818" fill="#b8b8b8"
stroke-width="2.1818"/>
+ <g stroke-width="2">
+ <path d="m6 6v20h20v-20zm2 2h16v16h-16z" fill="#4d4d4d"/>
+ <path d="m6 4c-1.108 0-2 0.892-2 2v20c0 1.108 0.892 2 2 2h20c1.108 0 2-0.892
2-2v-20c0-1.108-0.892-2-2-2zm0 2h20v20h-20z" fill="#808080"/>
+ <path d="m6 6h20v20h-20z" fill="#fff"/>
+ </g>
+</svg>
diff --git a/icon-themes/colibre_svg/svx/res/shadow_top_right_32.svg
b/icon-themes/colibre_svg/svx/res/shadow_top_right_32.svg
new file mode 100644
index 000000000000..1cc4910279f5
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/shadow_top_right_32.svg
@@ -0,0 +1,8 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";>
+ <rect x="8" width="24" height="24" ry="2.1818" fill="#b8b8b8"
stroke-width="2.1818"/>
+ <g stroke-width="2">
+ <path d="m6 6v20h20v-20zm2 2h16v16h-16z" fill="#4d4d4d"/>
+ <path d="m6 4c-1.108 0-2 0.892-2 2v20c0 1.108 0.892 2 2 2h20c1.108 0 2-0.892
2-2v-20c0-1.108-0.892-2-2-2zm0 2h20v20h-20z" fill="#808080"/>
+ <path d="m6 6h20v20h-20z" fill="#fff"/>
+ </g>
+</svg>
diff --git a/icon-themes/galaxy/svx/res/border_cell_all_32.png
b/icon-themes/galaxy/svx/res/border_cell_all_32.png
new file mode 100644
index 000000000000..0d058ddffd97
Binary files /dev/null and b/icon-themes/galaxy/svx/res/border_cell_all_32.png
differ
diff --git a/icon-themes/galaxy/svx/res/border_cell_diag_32.png
b/icon-themes/galaxy/svx/res/border_cell_diag_32.png
new file mode 100644
index 000000000000..6bc5a0bd114a
Binary files /dev/null and b/icon-themes/galaxy/svx/res/border_cell_diag_32.png
differ
diff --git a/icon-themes/galaxy/svx/res/border_cell_l_32.png
b/icon-themes/galaxy/svx/res/border_cell_l_32.png
new file mode 100644
index 000000000000..5671a352a959
Binary files /dev/null and b/icon-themes/galaxy/svx/res/border_cell_l_32.png
differ
diff --git a/icon-themes/galaxy/svx/res/border_cell_lr_32.png
b/icon-themes/galaxy/svx/res/border_cell_lr_32.png
new file mode 100644
index 000000000000..3dbad69f9c79
Binary files /dev/null and b/icon-themes/galaxy/svx/res/border_cell_lr_32.png
differ
diff --git a/icon-themes/galaxy/svx/res/border_cell_none_32.png
b/icon-themes/galaxy/svx/res/border_cell_none_32.png
new file mode 100644
index 000000000000..956eeccaf82d
Binary files /dev/null and b/icon-themes/galaxy/svx/res/border_cell_none_32.png
differ
diff --git a/icon-themes/galaxy/svx/res/border_cell_tb_32.png
b/icon-themes/galaxy/svx/res/border_cell_tb_32.png
new file mode 100644
index 000000000000..1d36fa6be45b
Binary files /dev/null and b/icon-themes/galaxy/svx/res/border_cell_tb_32.png
differ
diff --git a/icon-themes/galaxy/svx/res/shadow_bottom_left_32.png
b/icon-themes/galaxy/svx/res/shadow_bottom_left_32.png
new file mode 100644
index 000000000000..36f4664586fa
Binary files /dev/null and
b/icon-themes/galaxy/svx/res/shadow_bottom_left_32.png differ
diff --git a/icon-themes/galaxy/svx/res/shadow_bottom_right_32.png
b/icon-themes/galaxy/svx/res/shadow_bottom_right_32.png
new file mode 100644
index 000000000000..491edf21a428
Binary files /dev/null and
b/icon-themes/galaxy/svx/res/shadow_bottom_right_32.png differ
diff --git a/icon-themes/galaxy/svx/res/shadow_none_32.png
b/icon-themes/galaxy/svx/res/shadow_none_32.png
new file mode 100644
index 000000000000..0fd56b62755a
Binary files /dev/null and b/icon-themes/galaxy/svx/res/shadow_none_32.png
differ
diff --git a/icon-themes/galaxy/svx/res/shadow_top_left_32.png
b/icon-themes/galaxy/svx/res/shadow_top_left_32.png
new file mode 100644
index 000000000000..209f9c0d6f2b
Binary files /dev/null and b/icon-themes/galaxy/svx/res/shadow_top_left_32.png
differ
diff --git a/icon-themes/galaxy/svx/res/shadow_top_right_32.png
b/icon-themes/galaxy/svx/res/shadow_top_right_32.png
new file mode 100644
index 000000000000..e7b1b1476d16
Binary files /dev/null and b/icon-themes/galaxy/svx/res/shadow_top_right_32.png
differ
commit 5409c8b90fe6ce8e85ca6e74e09045ec52a49716
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Thu Mar 28 17:43:29 2019 +0900
Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Mon Apr 1 16:39:52 2019 +0900
tdf#124148 add configurable margin for the listbox pop-up list
This is needed to increase the area of lisbox entries in the
pop-up list so it is easier to select with touch.
Reviewed-on: https://gerrit.libreoffice.org/69889
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
(cherry picked from commit ce9dab8c161e29769131cec741a6a9cceec8552d)
Change-Id: Iedb910508de26c903dc3f50f645f567d4c988940
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index 402275af73a0..c241a4a0515c 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -50,6 +50,8 @@ struct ImplEntryType
ListBoxEntryFlags mnFlags;
long mnHeight;
+ long getHeightWithMargin() const;
+
ImplEntryType( const OUString& rStr, const Image& rImage ) :
maStr( rStr ),
maImage( rImage ),
@@ -313,6 +315,7 @@ public:
tools::Rectangle GetBoundingRectangle( sal_Int32 nItem ) const;
long GetEntryHeight() const { return mnMaxHeight; }
+ long GetEntryHeightWithMargin() const;
long GetMaxEntryWidth() const { return mnMaxWidth; }
void SetScrollHdl( const Link<ImplListBoxWindow*,void>& rLink )
{ maScrollHdl = rLink; }
@@ -437,6 +440,7 @@ public:
Size CalcSize( sal_Int32 nMaxLines ) const {
return maLBWindow->CalcSize( nMaxLines ); }
long GetEntryHeight() const { return
maLBWindow->GetEntryHeight(); }
+ long GetEntryHeightWithMargin() const{ return
maLBWindow->GetEntryHeightWithMargin(); }
long GetMaxEntryWidth() const { return
maLBWindow->GetMaxEntryWidth(); }
void SetScrollHdl( const Link<ImplListBox*,void>& rLink ) {
maScrollHdl = rLink; }
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index f0473f2dd2c4..bbe9a75b379c 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -303,6 +303,8 @@ struct ImplSVNWFData
// floating toolbars that can be redocked because there's no way to track
// that the toolbar is over a dockable area.
bool mbCanDetermineWindowPosition = true;
+
+ int mnListBoxEntryMargin = 0;
};
struct BlendFrameCache
diff --git a/vcl/source/control/imp_listbox.cxx
b/vcl/source/control/imp_listbox.cxx
index 2161c041077e..2f4f52fde220 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -305,7 +305,7 @@ long ImplEntryList::GetAddedHeight( sal_Int32 i_nEndIndex,
sal_Int32 i_nBeginInd
sal_Int32 nIndex = nStart;
while( nIndex != LISTBOX_ENTRY_NOTFOUND && nIndex < nStop )
{
- long nPosHeight = GetEntryPtr( nIndex )->mnHeight;
+ long nPosHeight = GetEntryPtr( nIndex )->getHeightWithMargin();
if (nHeight > ::std::numeric_limits<long>::max() - nPosHeight)
{
SAL_WARN( "vcl", "ImplEntryList::GetAddedHeight: truncated");
@@ -323,7 +323,7 @@ long ImplEntryList::GetAddedHeight( sal_Int32 i_nEndIndex,
sal_Int32 i_nBeginInd
long ImplEntryList::GetEntryHeight( sal_Int32 nPos ) const
{
ImplEntryType* pImplEntry = GetEntry( nPos );
- return pImplEntry ? pImplEntry->mnHeight : 0;
+ return pImplEntry ? pImplEntry->getHeightWithMargin() : 0;
}
OUString ImplEntryList::GetEntryText( sal_Int32 nPos ) const
@@ -558,7 +558,7 @@ void ImplListBoxWindow::ImplCalcMetrics()
if( mnCurrentPos != LISTBOX_ENTRY_NOTFOUND )
{
- Size aSz( GetOutputSizePixel().Width(), mpEntryList->GetEntryPtr(
mnCurrentPos )->mnHeight );
+ Size aSz( GetOutputSizePixel().Width(), mpEntryList->GetEntryPtr(
mnCurrentPos )->getHeightWithMargin() );
maFocusRect.SetSize( aSz );
}
}
@@ -601,6 +601,11 @@ struct ImplEntryMetrics
long nImgHeight;
};
+long ImplEntryType::getHeightWithMargin() const
+{
+ return mnHeight + ImplGetSVData()->maNWFData.mnListBoxEntryMargin;
+}
+
void ImplListBoxWindow::EnableQuickSelection( bool b )
{
maQuickSelectionEngine.SetEnabled( b );
@@ -779,9 +784,10 @@ sal_Int32 ImplListBoxWindow::GetEntryPosForPoint( const
Point& rPoint ) const
sal_Int32 nSelect = mnTop;
const ImplEntryType* pEntry = mpEntryList->GetEntryPtr( nSelect );
- while( pEntry && rPoint.Y() > pEntry->mnHeight + nY )
+ long nEntryHeight = pEntry->getHeightWithMargin();
+ while( pEntry && rPoint.Y() > nEntryHeight + nY )
{
- nY += pEntry->mnHeight;
+ nY += nEntryHeight;
pEntry = mpEntryList->GetEntryPtr( ++nSelect );
}
if( pEntry == nullptr )
@@ -806,6 +812,12 @@ bool ImplListBoxWindow::IsVisible( sal_Int32 i_nEntry )
const
return bRet;
}
+long ImplListBoxWindow::GetEntryHeightWithMargin() const
+{
+ long nMargin = ImplGetSVData()->maNWFData.mnListBoxEntryMargin;
+ return mnMaxHeight + nMargin;
+}
+
sal_Int32 ImplListBoxWindow::GetLastVisibleEntry() const
{
sal_Int32 nPos = mnTop;
@@ -1693,7 +1705,7 @@ void ImplListBoxWindow::ImplPaint(vcl::RenderContext&
rRenderContext, sal_Int32
long nWidth = GetOutputSizePixel().Width();
long nY = mpEntryList->GetAddedHeight(nPos, mnTop);
- tools::Rectangle aRect(Point(0, nY), Size(nWidth, pEntry->mnHeight));
+ tools::Rectangle aRect(Point(0, nY), Size(nWidth,
pEntry->getHeightWithMargin()));
if (mpEntryList->IsEntryPosSelected(nPos))
{
@@ -1740,6 +1752,8 @@ void ImplListBoxWindow::DrawEntry(vcl::RenderContext&
rRenderContext, sal_Int32
if (!pEntry)
return;
+ long nEntryHeight = pEntry->getHeightWithMargin();
+
// when changing this function don't forget to adjust ImplWin::DrawEntry()
if (mbInUserDraw)
@@ -1754,7 +1768,8 @@ void ImplListBoxWindow::DrawEntry(vcl::RenderContext&
rRenderContext, sal_Int32
if (!!aImage)
{
aImgSz = aImage.GetSizePixel();
- Point aPtImg(mnBorder - mnLeft, nY + ((pEntry->mnHeight -
aImgSz.Height()) / 2));
+
+ Point aPtImg(mnBorder - mnLeft, nY + ((nEntryHeight -
aImgSz.Height()) / 2));
// pb: #106948# explicit mirroring for calc
if (mbMirroring)
@@ -1801,7 +1816,7 @@ void ImplListBoxWindow::DrawEntry(vcl::RenderContext&
rRenderContext, sal_Int32
nMaxWidth = GetOutputSizePixel().Width() - 2 * mnBorder;
tools::Rectangle aTextRect(Point(mnBorder - mnLeft, nY),
- Size(nMaxWidth, pEntry->mnHeight));
+ Size(nMaxWidth, nEntryHeight));
if (!bDrawTextAtImagePos && (mpEntryList->HasEntryImage(nPos) ||
IsUserDrawEnabled()))
{
@@ -1835,7 +1850,7 @@ void ImplListBoxWindow::DrawEntry(vcl::RenderContext&
rRenderContext, sal_Int32
rRenderContext.SetLineColor((GetBackground().GetColor() !=
COL_LIGHTGRAY) ? COL_LIGHTGRAY : COL_GRAY);
Point aStartPos(0, nY);
if (nPos == mnSeparatorPos)
- aStartPos.Y() += pEntry->mnHeight - 1;
+ aStartPos.Y() += pEntry->getHeightWithMargin() - 1;
Point aEndPos(aStartPos);
aEndPos.X() = GetOutputSizePixel().Width();
rRenderContext.DrawLine(aStartPos, aEndPos);
@@ -1863,12 +1878,13 @@ void ImplListBoxWindow::ImplDoPaint(vcl::RenderContext&
rRenderContext, const to
for (sal_Int32 i = mnTop; i < nCount && nY < nHeight + mnMaxHeight; i++)
{
const ImplEntryType* pEntry = mpEntryList->GetEntryPtr(i);
- if (nY + pEntry->mnHeight >= rRect.Top() &&
+ long nEntryHeight = pEntry->getHeightWithMargin();
+ if (nY + nEntryHeight >= rRect.Top() &&
nY <= rRect.Bottom() + mnMaxHeight)
{
ImplPaint(rRenderContext, i);
}
- nY += pEntry->mnHeight;
+ nY += nEntryHeight;
}
long nHeightDiff = mpEntryList->GetAddedHeight(mnCurrentPos, mnTop);
@@ -1947,7 +1963,7 @@ void ImplListBoxWindow::SetTopEntry( sal_Int32 nTop )
if( nTop > nLastEntry )
nTop = nLastEntry;
const ImplEntryType* pLast = mpEntryList->GetEntryPtr( nLastEntry );
- while( nTop > 0 && mpEntryList->GetAddedHeight( nLastEntry, nTop-1 ) +
pLast->mnHeight <= nWHeight )
+ while( nTop > 0 && mpEntryList->GetAddedHeight( nLastEntry, nTop-1 ) +
pLast->getHeightWithMargin() <= nWHeight )
nTop--;
if ( nTop != mnTop )
@@ -2019,7 +2035,7 @@ Size ImplListBoxWindow::CalcSize(sal_Int32 nMaxLines)
const
// FIXME: ListBoxEntryFlags::MultiLine
Size aSz;
- aSz.Height() = nMaxLines * mnMaxHeight;
+ aSz.Height() = nMaxLines * GetEntryHeightWithMargin();
aSz.Width() = mnMaxWidth + 2*mnBorder;
return aSz;
}
@@ -2027,8 +2043,8 @@ Size ImplListBoxWindow::CalcSize(sal_Int32 nMaxLines)
const
tools::Rectangle ImplListBoxWindow::GetBoundingRectangle( sal_Int32 nItem )
const
{
const ImplEntryType* pEntry = mpEntryList->GetEntryPtr( nItem );
- Size aSz( GetSizePixel().Width(), pEntry ? pEntry->mnHeight :
GetEntryHeight() );
- long nY = mpEntryList->GetAddedHeight( nItem, GetTopEntry() ) +
GetEntryList()->GetMRUCount()*GetEntryHeight();
+ Size aSz( GetSizePixel().Width(), pEntry ? pEntry->getHeightWithMargin() :
GetEntryHeightWithMargin() );
+ long nY = mpEntryList->GetAddedHeight( nItem, GetTopEntry() ) +
GetEntryList()->GetMRUCount()*GetEntryHeightWithMargin();
tools::Rectangle aRect( Point( 0, nY ), aSz );
return aRect;
}
@@ -2251,7 +2267,7 @@ void ImplListBox::ImplCheckScrollBars()
Size aOutSz = GetOutputSizePixel();
sal_Int32 nEntries = GetEntryList()->GetEntryCount();
- sal_uInt16 nMaxVisEntries = (sal_uInt16) (aOutSz.Height() /
GetEntryHeight());
+ sal_uInt16 nMaxVisEntries = (sal_uInt16) (aOutSz.Height() /
GetEntryHeightWithMargin());
// vertical ScrollBar
if( nEntries > nMaxVisEntries )
@@ -2291,7 +2307,7 @@ void ImplListBox::ImplCheckScrollBars()
if ( !mbVScroll ) // maybe we do need one now
{
- nMaxVisEntries = (sal_uInt16) ( ( aOutSz.Height() -
mpHScrollBar->GetSizePixel().Height() ) / GetEntryHeight() );
+ nMaxVisEntries = (sal_uInt16) ( ( aOutSz.Height() -
mpHScrollBar->GetSizePixel().Height() ) / GetEntryHeightWithMargin() );
if( nEntries > nMaxVisEntries )
{
bArrange = true;
@@ -2333,7 +2349,7 @@ void ImplListBox::ImplInitScrollBars()
if ( mbVScroll )
{
sal_Int32 nEntries = GetEntryList()->GetEntryCount();
- sal_uInt16 nVisEntries = (sal_uInt16) (aOutSz.Height() /
GetEntryHeight());
+ sal_uInt16 nVisEntries = (sal_uInt16) (aOutSz.Height() /
GetEntryHeightWithMargin());
mpVScrollBar->SetRangeMax( nEntries );
mpVScrollBar->SetVisibleSize( nVisEntries );
mpVScrollBar->SetPageSize( nVisEntries - 1 );
@@ -3030,7 +3046,7 @@ Size ImplListBoxFloatingWindow::CalcFloatSize()
// align height to entries...
long nInnerHeight = aFloatSz.Height() - nTop - nBottom;
- long nEntryHeight = mpImplLB->GetEntryHeight();
+ long nEntryHeight = mpImplLB->GetEntryHeightWithMargin();
if ( nInnerHeight % nEntryHeight )
{
nInnerHeight /= nEntryHeight;
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index b6729a3b2904..1bc1e052ca75 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -1229,7 +1229,7 @@ Size ListBox::CalcSubEditSize() const
aSz = mpImplLB->CalcSize (mnLineCount ? mnLineCount :
mpImplLB->GetEntryList()->GetEntryCount());
else
{
- aSz.Height() = mpImplLB->CalcSize( 1 ).Height();
+ aSz.Height() = mpImplLB->GetEntryHeight();
// Size to maxmimum entry width
aSz.Width() = mpImplLB->GetMaxEntryWidth();
@@ -1323,7 +1323,7 @@ void ListBox::GetMaxVisColumnsAndLines( sal_uInt16&
rnCols, sal_uInt16& rnLines
{
Size aOutSz = mpImplLB->GetMainWindow()->GetOutputSizePixel();
rnCols = (sal_uInt16) (aOutSz.Width()/nCharWidth);
- rnLines = (sal_uInt16) (aOutSz.Height()/mpImplLB->GetEntryHeight());
+ rnLines = (sal_uInt16)
(aOutSz.Height()/mpImplLB->GetEntryHeightWithMargin());
}
else
{
diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index a31ef7a59bfc..5d2497aabcfc 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -80,6 +80,7 @@
FileDefinitionWidgetDraw::FileDefinitionWidgetDraw(SalGraphics& rGraphics)
pSVData->maNWFData.mbProgressNeedsErase = true;
pSVData->maNWFData.mnStatusBarLowerRightOffset = 10;
pSVData->maNWFData.mbCanDrawWidgetAnySize = true;
+ pSVData->maNWFData.mnListBoxEntryMargin = 20;
}
bool FileDefinitionWidgetDraw::isNativeControlSupported(ControlType eType,
ControlPart ePart)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
