diff options
| author | Heiko Tietze <tietze.heiko@gmail.com> | 2019-07-17 09:05:54 +0200 |
|---|---|---|
| committer | Heiko Tietze <heiko.tietze@documentfoundation.org> | 2019-07-17 12:53:18 +0200 |
| commit | bebc2280e43fc381e9085f2a397dad9dd7701fdd (patch) | |
| tree | c68e41562a311f9272f586ae5bf2e60b450bfe84 /svx | |
| parent | 0fbf06097db05072a8f2666440e6c9c22776c63d (diff) | |
Resolves tdf#115087 and tdf#121437 - Improvements to color bar
Tooltip for parent with hint on left/right click
Position of widget right (ideally it would go below the sidebar)
Automatic color moved to the bottom to preserve arrangement
Change-Id: Ia3cb1c2c7c20dbc6730c7f003c67b0876514c23f
Reviewed-on: https://gerrit.libreoffice.org/75749
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/SvxColorChildWindow.cxx | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/colrctrl.cxx | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/svx/source/tbxctrls/SvxColorChildWindow.cxx b/svx/source/tbxctrls/SvxColorChildWindow.cxx index be56d5c0cc26..4de63f9fd42c 100644 --- a/svx/source/tbxctrls/SvxColorChildWindow.cxx +++ b/svx/source/tbxctrls/SvxColorChildWindow.cxx @@ -36,7 +36,7 @@ SvxColorChildWindow::SvxColorChildWindow( vcl::Window* _pParent, SetWindow(pWin); - SetAlignment(SfxChildAlignment::BOTTOM); + SetAlignment(SfxChildAlignment::RIGHT); pWin->Initialize( pInfo ); } diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 772cde7797b5..329931809c3a 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -190,6 +190,7 @@ SvxColorDockingWindow::SvxColorDockingWindow nCount ( 0 ) { SetText(SvxResId(STR_COLORTABLE)); + SetQuickHelpText(SvxResId(RID_SVXSTR_COLORBAR)); SetSizePixel(LogicToPixel(Size(150, 22), MapMode(MapUnit::MapAppFont))); SetHelpId(HID_CTRL_COLOR); @@ -270,7 +271,9 @@ void SvxColorDockingWindow::FillValueSet() nCount = pColorList->Count(); aColorSet->Clear(); - // create the first entry for 'invisible/none' + aColorSet->addEntriesForXColorList(*pColorList, 2); + + // create the last entry for 'invisible/none' const Size aColorSize(SvxColorValueSet::getEntryEdgeLength(), SvxColorValueSet::getEntryEdgeLength()); long nPtX = aColorSize.Width() - 1; long nPtY = aColorSize.Height() - 1; @@ -286,7 +289,6 @@ void SvxColorDockingWindow::FillValueSet() aColorSet->InsertItem( sal_uInt16(1), Image(aBmp), SvxResId( RID_SVXSTR_INVISIBLE ) ); - aColorSet->addEntriesForXColorList(*pColorList, 2); } void SvxColorDockingWindow::SetSize() |