summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2017-08-16 18:39:51 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2017-08-16 18:39:51 +0000
commitab15602ad3e7fdd303219d69d4b1f311adb7d176 (patch)
tree6b0a1bfccb18b0a6af9a8439ae80fcd70d2cbdcf
parentReleasing progress-linux version 16.12.2-2~dschinn1. (diff)
downloadwxmaxima-ab15602ad3e7fdd303219d69d4b1f311adb7d176.zip
wxmaxima-ab15602ad3e7fdd303219d69d4b1f311adb7d176.tar.xz
Merging debian version 16.12.2-3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog5
-rw-r--r--debian/patches/102-image-size.patch40
-rw-r--r--debian/patches/series1
3 files changed, 46 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 2426cd8..f1228cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,8 @@
+wxmaxima (16.12.2-3) unstable; urgency=medium
+
+ * Added a patch that corrects the size of embedded plots. (Closes: #870499)
+ -- Gunter Königsmann <wxmaxima@physikbuch.de> Wed, 2 Aug 2017 19:57:36 +0100
+
wxmaxima (16.12.2-2~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/patches/102-image-size.patch b/debian/patches/102-image-size.patch
new file mode 100644
index 0000000..e6ff201
--- /dev/null
+++ b/debian/patches/102-image-size.patch
@@ -0,0 +1,40 @@
+Description: Embedded images were scaled to too small a size. This patch
+ makes them 90% of the screen height/width again.
+
+---
+ src/MathCtrl.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/MathCtrl.cpp b/src/MathCtrl.cpp
+index 14e3337a..d220250f 100644
+--- a/src/MathCtrl.cpp
++++ b/src/MathCtrl.cpp
+@@ -219,6 +219,7 @@ void MathCtrl::OnPaint(wxPaintEvent& event)
+ }
+
+ // Inform all cells how wide our display is
++ MathCell::SetCanvasSize(GetClientSize());
+ wxMemoryDC dcm;
+ wxPaintDC dc(this);
+
+@@ -490,6 +491,7 @@ GroupCell *MathCtrl::InsertGroupCells(
+ if (!next) // if there were no further cells
+ m_last = lastOfCellsToInsert;
+
++ m_tree->SetCanvasSize(GetClientSize());
+ if (renumbersections)
+ NumberSections();
+ Recalculate(where,false);
+@@ -660,6 +662,9 @@ void MathCtrl::Recalculate(GroupCell *start,bool force)
+ else
+ tmp = start;
+
++ if(m_tree)
++ m_tree->SetCanvasSize(GetClientSize());
++
+ m_configuration->SetForceUpdate(force);
+ m_configuration->SetClientWidth(GetClientSize().GetWidth() - MC_GROUP_LEFT_INDENT - Configuration::Get()->GetBaseIndent());
+
+--
+2.11.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 0bcd443..832b03b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
101-si_chdir_broken_in_gcl.patch
+102-image-size.patch