I have made the following changes intended for : CE:Apps:MTF / meego-terminal
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/4182 Thank You, vesku [This message was auto-generated] --- Request # 4182: Messages from BOSS: State: review at 2012-01-24T09:15:53 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:vesku:branches:CE:Apps:MTF / meego-terminal -> CE:Apps:MTF / meego-terminal changes files: -------------- --- meego-terminal.changes +++ meego-terminal.changes @@ -0,0 +1,3 @@ +* Mon Jan 23 2012 Vesa-Matti Hartikainen <[email protected]> - 0.2.2-1 +- Fixes NEMO#56: VKB overlaps with terminal content in landscape + new: ---- 0001-Fixes-NEMO-56.patch spec files: ----------- --- meego-terminal.spec +++ meego-terminal.spec @@ -15,6 +15,7 @@ Source0: meego-terminal-%{name}-Release_%{version}.1.tar.gz Source100: meego-terminal.yaml Patch0: meego-terminal-0.2.2.1-add-missing-libs-for-linking.patch +Patch1: 0001-Fixes-NEMO-56.patch BuildRequires: pkgconfig(QtCore) >= 4.6.0 BuildRequires: pkgconfig(meegotouch) BuildRequires: pkgconfig(x11) @@ -31,6 +32,8 @@ # meego-terminal-0.2.2.1-add-missing-libs-for-linking.patch %patch0 -p1 +# 0001-Fixes-NEMO-56.patch +%patch1 -p1 # >> setup # << setup other changes: -------------- ++++++ 0001-Fixes-NEMO-56.patch (new) --- 0001-Fixes-NEMO-56.patch +++ 0001-Fixes-NEMO-56.patch @@ -0,0 +1,28 @@ +From 4be686621d016e1d72380a5134cea4d7bd590f1a Mon Sep 17 00:00:00 2001 +From: Vesa-Matti Hartikainen <[email protected]> +Date: Mon, 23 Jan 2012 16:47:12 +0200 +Subject: [PATCH] Fixes NEMO#56 + +--- + src_meegotouch/MTermWidget.cpp | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/src_meegotouch/MTermWidget.cpp b/src_meegotouch/MTermWidget.cpp +index 8e14863..7422551 100644 +--- a/src_meegotouch/MTermWidget.cpp ++++ b/src_meegotouch/MTermWidget.cpp +@@ -256,10 +256,9 @@ void MTermWidget::resizeEvent(QGraphicsSceneResizeEvent *event) + else { + int newHeight = 0; // = where vkb starts - status bar + +- if (imArea.x() == 0) { // landscape ++ if( MInputMethodState::instance()->activeWindowOrientationAngle()==M::Angle0 ) { // landscape + newHeight = imArea.y() - scenePos().y(); + } +- + else if (imArea.y() == 0) { // portrait + newHeight = imArea.x() - scenePos().x(); + } +-- +1.6.4.4 + ++++++ meego-terminal.yaml --- meego-terminal.yaml +++ meego-terminal.yaml @@ -9,6 +9,8 @@ - "meego-terminal-%{name}-Release_%{version}.1.tar.gz" Patches: - meego-terminal-0.2.2.1-add-missing-libs-for-linking.patch + - 0001-Fixes-NEMO-56.patch + Description: Terminal emulator for MeeGo. Configure: none Builder: qmake
