This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch debian-experimental-5.0 in repository libreoffice.
commit 0f580bf41bd491f784664d98056a08860347e8a4 Author: Rene Engelhard <[email protected]> Date: Fri Aug 21 12:29:15 2015 +0200 git update; remove backported gtk3-rtl.diff again --- changelog | 6 +++ patches/gtk3-rtl.diff | 104 -------------------------------------------------- patches/series | 1 - 3 files changed, 6 insertions(+), 105 deletions(-) diff --git a/changelog b/changelog index bd358e9..5b46963 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,9 @@ +libreoffice (1:5.0.2~rc1~git20150822-1) UNRELEASED; urgency=medium + + * New upstream snapshot + + -- Rene Engelhard <[email protected]> Wed, 12 Aug 2015 15:23:58 +0200 + libreoffice (1:5.0.1~rc1-3) UNRELEASED; urgency=medium * debian/patches/gtk3-rtl.diff: backport GTk3 RTL fixes (arrows, checkboxes) diff --git a/patches/gtk3-rtl.diff b/patches/gtk3-rtl.diff deleted file mode 100644 index 3d9a72f..0000000 --- a/patches/gtk3-rtl.diff +++ /dev/null @@ -1,104 +0,0 @@ -From a803ec69f69068e0c45a7825094941b9ea765c1c Mon Sep 17 00:00:00 2001 -From: Khaled Hosny <[email protected]> -Date: Mon, 17 Aug 2015 00:49:39 +0200 -Subject: Fix GTK3 right-to-left rendering -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* Reverse the direction of arrows e.g. in menus -* Reverse the position of combobox button - -They are lumped together because fixing one breaks the other - -Change-Id: I65afb08785e67db72a72ad39f1de56db037b640a -Reviewed-on: https://gerrit.libreoffice.org/17788 -Tested-by: Jenkins <[email protected]> -Reviewed-by: Norbert Thiebaud <[email protected]> -Reviewed-on: https://gerrit.libreoffice.org/17845 -Reviewed-by: Caolán McNamara <[email protected]> -Tested-by: Caolán McNamara <[email protected]> - -diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx -index 126d6d1..1f04b2e 100644 ---- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx -+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx -@@ -77,6 +77,11 @@ static void NWConvertVCLStateToGTKState( ControlState nVCLState, - - if ( nVCLState & ControlState::FOCUSED ) - *nGTKState = (GtkStateFlags) (*nGTKState | GTK_STATE_FLAG_FOCUSED); -+ -+ if (AllSettings::GetLayoutRTL()) -+ { -+ *nGTKState = (GtkStateFlags) (*nGTKState | GTK_STATE_FLAG_DIR_RTL); -+ } - } - - enum { -@@ -661,9 +666,11 @@ Rectangle GtkSalGraphics::NWGetComboBoxButtonRect( ControlType nType, - nButtonWidth = nArrowWidth + padding.left + padding.right; - if( nPart == PART_BUTTON_DOWN ) - { -+ Point aPos = Point(aAreaRect.Left() + aAreaRect.GetWidth() - nButtonWidth, aAreaRect.Top()); -+ if (AllSettings::GetLayoutRTL()) -+ aPos.X() = aAreaRect.Left(); - aButtonRect.SetSize( Size( nButtonWidth, aAreaRect.GetHeight() ) ); -- aButtonRect.SetPos( Point( aAreaRect.Left() + aAreaRect.GetWidth() - nButtonWidth, -- aAreaRect.Top() ) ); -+ aButtonRect.SetPos(aPos); - } - else if( nPart == PART_SUB_EDIT ) - { -@@ -675,7 +682,10 @@ Rectangle GtkSalGraphics::NWGetComboBoxButtonRect( ControlType nType, - aButtonRect.SetSize( Size( aAreaRect.GetWidth() - nButtonWidth - (adjust_left + adjust_right), - aAreaRect.GetHeight() - (adjust_top + adjust_bottom)) ); - Point aEditPos = aAreaRect.TopLeft(); -- aEditPos.X() += adjust_left; -+ if (AllSettings::GetLayoutRTL()) -+ aEditPos.X() += nButtonWidth; -+ else -+ aEditPos.X() += adjust_left; - aEditPos.Y() += adjust_top; - aButtonRect.SetPos( aEditPos ); - } -@@ -703,6 +713,8 @@ void GtkSalGraphics::PaintCombobox( GtkStateFlags flags, cairo_t *cr, - - Rectangle aEditBoxRect( areaRect ); - aEditBoxRect.SetSize( Size( areaRect.GetWidth() - buttonRect.GetWidth(), aEditBoxRect.GetHeight() ) ); -+ if (AllSettings::GetLayoutRTL()) -+ aEditBoxRect.SetPos( Point( areaRect.Left() + buttonRect.GetWidth(), areaRect.Top() ) ); - - arrowRect.SetSize( Size( (gint)(ARROW_SIZE), - (gint)(ARROW_SIZE) ) ); -@@ -719,7 +731,10 @@ void GtkSalGraphics::PaintCombobox( GtkStateFlags flags, cairo_t *cr, - { - gtk_style_context_save(mpEntryStyle); - gtk_style_context_set_state(mpEntryStyle, flags); -- gtk_style_context_set_junction_sides(mpEntryStyle, GTK_JUNCTION_RIGHT); -+ if (AllSettings::GetLayoutRTL()) -+ gtk_style_context_set_junction_sides(mpEntryStyle, GTK_JUNCTION_LEFT); -+ else -+ gtk_style_context_set_junction_sides(mpEntryStyle, GTK_JUNCTION_RIGHT); - - gtk_render_background(mpComboboxStyle, cr, - 0, 0, -@@ -727,12 +742,13 @@ void GtkSalGraphics::PaintCombobox( GtkStateFlags flags, cairo_t *cr, - gtk_render_frame(mpComboboxStyle, cr, - 0, 0, - areaRect.GetWidth(), areaRect.GetHeight()); -- - gtk_render_background(mpEntryStyle, cr, -- 0, 0, -+ (aEditBoxRect.Left() - areaRect.Left()), -+ (aEditBoxRect.Top() - areaRect.Top()), - aEditBoxRect.GetWidth(), aEditBoxRect.GetHeight() ); - gtk_render_frame(mpEntryStyle, cr, -- 0, 0, -+ (aEditBoxRect.Left() - areaRect.Left()), -+ (aEditBoxRect.Top() - areaRect.Top()), - aEditBoxRect.GetWidth(), aEditBoxRect.GetHeight() ); - - gtk_style_context_restore(mpEntryStyle); --- -cgit v0.10.2 - diff --git a/patches/series b/patches/series index d9dc9e4..8d6e17e 100644 --- a/patches/series +++ b/patches/series @@ -30,4 +30,3 @@ gcj-no-bitness-check.diff rsc-no-error-about-unknown-switch.diff liborcus-0.9.1.diff disable-tiledrendering-test.diff -gtk3-rtl.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
