[Libreoffice-commits] core.git: sfx2/uiconfig vcl/source

[Caolán McNamara (via logerrit)]

 sfx2/uiconfig/ui/deck.ui  |2 +-
 sfx2/uiconfig/ui/infobar.ui   |2 +-
 vcl/source/window/builder.cxx |2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 96b461c36ec9c75bb03592c78c6fa641e3105c8d
Author: Caolán McNamara 
AuthorDate: Tue Jul 6 16:26:30 2021 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 6 20:54:34 2021 +0200

add window-close-symbolic to allowed symbolic icon names

and for vcl use vcl/res/closedoc.png for it

Change-Id: If3c31298d40e6130de415998df8840021a706a3a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118516
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sfx2/uiconfig/ui/deck.ui b/sfx2/uiconfig/ui/deck.ui
index 63252338677d..d3cd98e52981 100644
--- a/sfx2/uiconfig/ui/deck.ui
+++ b/sfx2/uiconfig/ui/deck.ui
@@ -101,7 +101,7 @@
 False
 Close Sidebar Deck
 True
-sfx2/res/closedoc.png
+window-close-symbolic
 
   
 Close Sidebar 
Deck
diff --git a/sfx2/uiconfig/ui/infobar.ui b/sfx2/uiconfig/ui/infobar.ui
index 3a9cc49a7f23..ae48bf3250c0 100644
--- a/sfx2/uiconfig/ui/infobar.ui
+++ b/sfx2/uiconfig/ui/infobar.ui
@@ -64,7 +64,7 @@
 True
 False
 Close Infobar
-sfx2/res/closedoc.png
+window-close-symbolic
   
   
 False
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 09dde08cb986..3a004e9fb660 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -108,6 +108,8 @@ namespace
 return IMG_PASTE;
 else if (sType == u"open-menu-symbolic")
 return IMG_MENU;
+else if (sType == u"window-close-symbolic")
+return SV_RESID_BITMAP_CLOSEDOC;
 else if (sType == u"x-office-calendar")
 return IMG_CALENDAR;
 return OUString();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/uiconfig vcl/source

[Gülşah Köse (via logerrit)]

 sfx2/uiconfig/ui/developmenttool.ui |2 +-
 vcl/source/window/layout.cxx|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 95a1ccff3a252315e1c2499331ded4bc2e660d54
Author: Gülşah Köse 
AuthorDate: Mon May 10 01:15:40 2021 +0300
Commit: Gülşah Köse 
CommitDate: Wed May 12 11:18:49 2021 +0200

tdf#141426 Fix VclBox inital size allocation.

Change-Id: If7380c9dbbcda091a2de93b722bf90182677af6c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115295
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Reviewed-by: Gülşah Köse 

diff --git a/sfx2/uiconfig/ui/developmenttool.ui 
b/sfx2/uiconfig/ui/developmenttool.ui
index 20f0c2e7d33d..826cf30a2fd8 100644
--- a/sfx2/uiconfig/ui/developmenttool.ui
+++ b/sfx2/uiconfig/ui/developmenttool.ui
@@ -589,7 +589,7 @@
 
   
   
-False
+True
 True
   
 
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 7ee7665e0b8e..79a843e5d30d 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -327,7 +327,7 @@ void VclBox::setAllocation(const Size )
 if (bFill)
 {
 setPrimaryDimension(aChildSize, 
std::max(static_cast(1),
-getPrimaryDimension(aBoxSize) - nPadding * 2));
+std::min(getPrimaryDimension(rAllocation), 
getPrimaryDimension(aBoxSize) - nPadding * 2)));
 
 setPrimaryCoordinate(aChildPos, nPrimaryCoordinate + nPadding);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/uiconfig vcl/source

[Caolán McNamara]

 sfx2/uiconfig/ui/startcenter.ui |4 ++--
 vcl/source/window/builder.cxx   |   27 +++
 2 files changed, 29 insertions(+), 2 deletions(-)

New commits:
commit 1413c5d39a45329b47c85511a3161c6f5a43c4f8
Author: Caolán McNamara 
Date:   Thu Jun 23 14:31:18 2016 +0100

map MenuToggleButton to GtkToggleButton with a custom menu property

we don't have non-menu ToggleButtons yet, so thats not done here.

since we first started with GtkPushButton:menu_attrib to indicate
menubuttons gtk has grown menu buttons, but they don't have the
idea of a gtktogglemenu button, so this attribute still has a role
to play I guess

Change-Id: Iebfe5ccf996e22784cf9aaf2bcf367eed79ae686

diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 68ab548..79b1484 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -171,7 +171,7 @@
   
 
 
-  
+  
 _Recent 
Files
 True
 True
@@ -190,7 +190,7 @@
   
 
 
-  
+  
 T_emplates
 True
 True
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index fc8069e..2f1fd3d 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -942,6 +942,22 @@ namespace
 return xWindow;
 }
 
+VclPtr extractStockAndBuildMenuToggleButton(vcl::Window *pParent, 
VclBuilder::stringmap )
+{
+WinBits nBits = WB_CLIPCHILDREN|WB_CENTER|WB_VCENTER|WB_3DLOOK;
+
+nBits |= extractRelief(rMap);
+
+VclPtr xWindow = VclPtr::Create(pParent, 
nBits);
+
+if (extractStock(rMap))
+{
+xWindow->SetText(getStockText(extractLabel(rMap)));
+}
+
+return xWindow;
+}
+
 OString extractUnit(const OString& sPattern)
 {
 OString sUnit(sPattern);
@@ -1370,6 +1386,17 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 setupFromActionName(xButton, rMap, m_xFrame);
 xWindow = xButton;
 }
+else if (name == "GtkToggleButton")
+{
+VclPtr xButton;
+OString sMenu = extractCustomProperty(rMap);
+assert(sMenu.getLength() && "not implemented yet");
+xButton = extractStockAndBuildMenuToggleButton(pParent, rMap);
+m_pParserState->m_aButtonMenuMaps.push_back(ButtonMenuMap(id, sMenu));
+xButton->SetImageAlign(ImageAlign::Left); //default to left
+setupFromActionName(xButton, rMap, m_xFrame);
+xWindow = xButton;
+}
 else if (name == "GtkRadioButton")
 {
 extractGroup(id, rMap);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits