Hello community, here is the log from the commit of package xournalpp for openSUSE:Factory checked in at 2019-02-25 17:55:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xournalpp (Old) and /work/SRC/openSUSE:Factory/.xournalpp.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xournalpp" Mon Feb 25 17:55:35 2019 rev:2 rq:678412 version:1.0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/xournalpp/xournalpp.changes 2019-02-01 11:44:40.648599811 +0100 +++ /work/SRC/openSUSE:Factory/.xournalpp.new.28833/xournalpp.changes 2019-02-25 17:55:38.658427797 +0100 @@ -1,0 +2,14 @@ +Tue Feb 19 11:34:38 UTC 2019 - [email protected] + +- Update to version 1.0.8: + * Audio recording directly integrated, no VLC etc. needed. + * LaTex use now vector graphics. + * Multiple page layout. + * Minor bug fixes. +- Add xournalpp-fix-horizontal-space.patch: fix adding horizontal + space to document view from preferences; patch taken from + upstream commit (gh#xournalpp/xournalpp#906). +- New upstream build dependencies: pkgconfig(portaudiocpp), + pkgconfig(sndfile). + +------------------------------------------------------------------- Old: ---- 1.0.7.tar.gz New: ---- 1.0.8.tar.gz xournalpp-fix-horizontal-space.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xournalpp.spec ++++++ --- /var/tmp/diff_new_pack.UbIGkq/_old 2019-02-25 17:55:39.538426659 +0100 +++ /var/tmp/diff_new_pack.UbIGkq/_new 2019-02-25 17:55:39.538426659 +0100 @@ -1,7 +1,7 @@ # # spec file for package xournalpp # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,18 +12,20 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: xournalpp -Version: 1.0.7 +Version: 1.0.8 Release: 0 Summary: Notetaking software designed around a tablet License: GPL-2.0-or-later Group: Productivity/Office/Other URL: https://github.com/xournalpp/xournalpp Source0: https://github.com/xournalpp/xournalpp/archive/%{version}.tar.gz +# PATCH-FIX-UPSTREAM xournalpp-fix-horizontal-space.patch gh#xournalpp/xournalpp#906 [email protected] -- Fix adding horizontal space to document view from preferences; patch taken from upstream commit +Patch0: xournalpp-fix-horizontal-space.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -33,8 +35,10 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(poppler-glib) BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(poppler-glib) +BuildRequires: pkgconfig(portaudiocpp) +BuildRequires: pkgconfig(sndfile) BuildRequires: pkgconfig(zlib) Requires: texlive-latex-bin @@ -46,14 +50,18 @@ %prep %setup -q +%patch0 -p1 %build -%cmake -DENABLE_MATHTEX=ON +%cmake %make_jobs %install %cmake_install +# REMOVE UNNECESSARY SCRIPTS update-icon-cache IS TAKEN CARE OF BY RPM FILE TRIGGERS +rm %{buildroot}%{_datadir}/%{name}/ui/*/hicolor/update-icon-cache.sh + %find_lang xournalpp %{no_lang_C} %fdupes %{buildroot}%{_datadir} ++++++ 1.0.7.tar.gz -> 1.0.8.tar.gz ++++++ /work/SRC/openSUSE:Factory/xournalpp/1.0.7.tar.gz /work/SRC/openSUSE:Factory/.xournalpp.new.28833/1.0.8.tar.gz differ: char 26, line 1 ++++++ xournalpp-fix-horizontal-space.patch ++++++ >From cdcf02d1a4703d7c146b5479a751ae18180abac6 Mon Sep 17 00:00:00 2001 From: Andreas Butti <[email protected]> Date: Mon, 18 Feb 2019 18:25:25 +0100 Subject: [PATCH] fixes #906 --- src/gui/Layout.cpp | 59 ++++++++++++++++++++++++++++++---------- src/gui/LayoutMapper.cpp | 5 ---- 2 files changed, 44 insertions(+), 20 deletions(-) diff --git a/src/gui/Layout.cpp b/src/gui/Layout.cpp index d8b15535..c6a6d84a 100644 --- a/src/gui/Layout.cpp +++ b/src/gui/Layout.cpp @@ -9,6 +9,27 @@ #include "gui/LayoutMapper.h" +/** + * Padding outside the pages, including shadow + */ +const int XOURNAL_PADDING = 10; + +/** + * Padding outside the pages, if additional padding is set + */ +const int XOURNAL_PADDING_FREE_SPACE = 150; + +/** + * Allowance for shadow between page pairs in paired page mode + */ +const int XOURNAL_ROOM_FOR_SHADOW = 3; + +/** + * Padding between the pages + */ +const int XOURNAL_PADDING_BETWEEN = 15; + + Layout::Layout(XournalView* view, ScrollHandling* scrollHandling) : view(view), scrollHandling(scrollHandling), @@ -174,21 +195,6 @@ double Layout::getLayoutWidth() return layoutWidth; } -/** - * Padding outside the pages, including shadow - */ -const int XOURNAL_PADDING = 10; - -/** - * Allowance for shadow between page pairs in paired page mode - */ -const int XOURNAL_ROOM_FOR_SHADOW = 3; - -/** - * Padding between the pages - */ -const int XOURNAL_PADDING_BETWEEN = 15; - void Layout::layoutPages() { XOJ_CHECK_TYPE(Layout); @@ -238,6 +244,19 @@ void Layout::layoutPages() int x = XOURNAL_PADDING; int y = XOURNAL_PADDING; + bool verticalSpace = settings->getAddVerticalSpace(); + bool horizontalSpace = settings->getAddHorizontalSpace(); + + if (verticalSpace) + { + x += XOURNAL_PADDING_FREE_SPACE; + } + + if (horizontalSpace) + { + y += XOURNAL_PADDING_FREE_SPACE; + } + // Iterate over ALL possible rows and columns and let the mapper tell us what page, if any, is found there. for (int r = 0; r < rows; r++) { @@ -308,6 +327,16 @@ void Layout::layoutPages() totalHeight += sizeRow[r]; } + if (verticalSpace) + { + totalWidth += XOURNAL_PADDING_FREE_SPACE * 2; + } + + if (horizontalSpace) + { + totalHeight += XOURNAL_PADDING_FREE_SPACE * 2; + } + this->setLayoutSize(totalWidth, totalHeight); this->view->pagePosition->update(this->view->viewPages, len, totalHeight); } diff --git a/src/gui/LayoutMapper.cpp b/src/gui/LayoutMapper.cpp index 8d97147d..4cf079a0 100644 --- a/src/gui/LayoutMapper.cpp +++ b/src/gui/LayoutMapper.cpp @@ -41,11 +41,6 @@ LayoutMapper::LayoutMapper(int numPages, Settings* settings) int pages = numPages; // get from user settings: - - // TODO: Use these again? - bool verticalSpace = settings->getAddVerticalSpace(); - // TODO: Use these again? - bool horizontalSpace = settings->getAddHorizontalSpace(); bool isPairedPages = settings->isShowPairedPages(); int numCols = settings->getViewColumns(); int numRows = settings->getViewRows();
