Attachment 69891 Details for Bug 42070 – patch for fixing presnter console standrad layout mode

patch for fixing presnter console standrad layout mode

0001-Fix-RTL-presnter-console-standrad-layout-mode.patch (text/plain), 3.63 KB, created by abdulmajeed on 2012-11-11 07:40:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: abdulmajeed

Created: 2012-11-11 07:40:26 UTC

Size: 3.63 KB

patch

obsolete

>From 3ff09f7e05075038fba97454adb63f547f59f459 Mon Sep 17 00:00:00 2001
>From: Abdulmajeed Al-Abaulrazzaq <aalabdulrazzaq@kacst.edu.sa>
>Date: Sun, 11 Nov 2012 10:21:47 +0300
>Subject: [PATCH] Fix RTL presnter console standrad layout mode
>
>Change-Id: I7ba73005f9371dcc844c2e44a3eea99b7aac30f7
>---
> sdext/Library_presenter.mk                        |    1 +
> sdext/source/presenter/PresenterWindowManager.cxx |   43 ++++++++++++++++++++-
> 2 files changed, 42 insertions(+), 2 deletions(-)
>
>diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk
>index 7dcb3fd..8153e0d 100644
>--- a/sdext/Library_presenter.mk
>+++ b/sdext/Library_presenter.mk
>@@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,PresenterScreen,\
>     cppu \
>     cppuhelper \
>     sal \
>+    vcl \
> ))
> 
> $(eval $(call gb_Library_add_exception_objects,PresenterScreen,\
>diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
>index 88359a2..302fdb7 100644
>--- a/sdext/source/presenter/PresenterWindowManager.cxx
>+++ b/sdext/source/presenter/PresenterWindowManager.cxx
>@@ -19,7 +19,7 @@
> 
> #undef ENABLE_PANE_RESIZING
> //#define ENABLE_PANE_RESIZING
>-
>+#include <vcl/svapp.hxx>
> #include "PresenterWindowManager.hxx"
> #include "PresenterController.hxx"
> #include "PresenterGeometryHelper.hxx"
>@@ -656,6 +656,7 @@ void PresenterWindowManager::LayoutStandardMode (void)
>     const double nHorizontalSlideDivide (aBox.Width / nGoldenRatio);
>     double nSlidePreviewTop (0);
> 
>+    if(!Application::GetSettings().GetLayoutRTL()){
>     // For the current slide view calculate the outer height from the outer
>     // width.  This takes into acount the slide aspect ratio and thus has to
>     // go over the inner pane size.
>@@ -691,8 +692,46 @@ void PresenterWindowManager::LayoutStandardMode (void)
>             aNextSlideOuterBox.Width,
>             aNextSlideOuterBox.Height);
>     }
>+  }
>+    else{
>+
>+    // For the current slide view calculate the outer height from the outer
>+    // width.  This takes into acount the slide aspect ratio and thus has to
>+    // go over the inner pane size.
>+     PresenterPaneContainer::SharedPaneDescriptor pPane (
>+        mpPaneContainer->FindPaneURL(PresenterPaneFactory::msCurrentSlidePreviewPaneURL));
>+    if (pPane.get() != NULL)
>+    {
>+        const awt::Size aNextSlideOuterBox (CalculatePaneSize(
>+            nHorizontalSlideDivide - 1.5*nGap,
>+            PresenterPaneFactory::msCurrentSlidePreviewPaneURL));
>+        nSlidePreviewTop = (aBox.Height - aNextSlideOuterBox.Height) / 2;
>+        SetPanePosSizeAbsolute (
>+            PresenterPaneFactory::msCurrentSlidePreviewPaneURL,
>+            aBox.Width - aNextSlideOuterBox.Width - nGap,
>+            nSlidePreviewTop,
>+            aNextSlideOuterBox.Width,
>+            aNextSlideOuterBox.Height);
>+    }
> 
>-    LayoutToolBar();
>+    // For the next slide view calculate the outer height from the outer
>+    // width.  This takes into acount the slide aspect ratio and thus has to
>+    // go over the inner pane size.
>+    pPane = mpPaneContainer->FindPaneURL(PresenterPaneFactory::msNextSlidePreviewPaneURL);
>+    if (pPane.get() != NULL)
>+    {
>+        const awt::Size aCurrentSlideOuterBox(CalculatePaneSize(
>+            aBox.Width - nHorizontalSlideDivide - 1.5*nGap,
>+            PresenterPaneFactory::msNextSlidePreviewPaneURL));
>+        SetPanePosSizeAbsolute (
>+            PresenterPaneFactory::msNextSlidePreviewPaneURL,
>+            nGap,
>+            nSlidePreviewTop,
>+            aCurrentSlideOuterBox.Width,
>+            aCurrentSlideOuterBox.Height);
>+    }
>+ }
>+   LayoutToolBar();
> }
> 
> void PresenterWindowManager::LayoutNotesMode (void)
>-- 
>1.7.7.6
>

Actions: View

Attachments on bug 42070: 52604 | 54530 | 69891