SVN commit 1171432 by hein:

Update changelog; minor code cleanup.


 M  +4 -0      ChangeLog  
 M  +36 -30    app/sessionstack.cpp  


--- trunk/extragear/utils/yakuake/ChangeLog #1171431:1171432
@@ -9,6 +9,10 @@
   the KDE Desktop Effect "Sliding Popups" is enabled as well, the animation
   will be performed by KDE's window manager KWin, for much improved smooth-
   ness on many systems.
+* Added keyboard shortcuts to attempt to grow the active terminal in the
+  left, right, top or bottom direction by 10px, as well as D-Bus calls to
+  attempt to grow any particular terminal by a given amount of pixels in
+  one of these directions.
 
 
 Changes in 2.9.7:
--- trunk/extragear/utils/yakuake/app/sessionstack.cpp #1171431:1171432
@@ -72,34 +72,6 @@
     addSession(Session::TwoVertical);
 }
 
-int SessionStack::tryGrowTerminalRight(int terminalId, uint pixels)
-{
-    int sessionId = sessionIdForTerminalId(terminalId);
-    if (sessionId == -1) return -1;
-    return m_sessions.value(sessionId)->tryGrowTerminal(terminalId, Session::Right, pixels);
-}
-
-int SessionStack::tryGrowTerminalLeft(int terminalId, uint pixels)
-{
-    int sessionId = sessionIdForTerminalId(terminalId);
-    if (sessionId == -1) return -1;
-    return m_sessions.value(sessionId)->tryGrowTerminal(terminalId, Session::Left, pixels);
-}
-
-int SessionStack::tryGrowTerminalTop(int terminalId, uint pixels)
-{
-    int sessionId = sessionIdForTerminalId(terminalId);
-    if (sessionId == -1) return -1;
-    return m_sessions.value(sessionId)->tryGrowTerminal(terminalId, Session::Up, pixels);
-}
-
-int SessionStack::tryGrowTerminalBottom(int terminalId, uint pixels)
-{
-    int sessionId = sessionIdForTerminalId(terminalId);
-    if (sessionId == -1) return -1;
-    return m_sessions.value(sessionId)->tryGrowTerminal(terminalId, Session::Down, pixels);
-}
-
 void SessionStack::addSessionQuad()
 {
     addSession(Session::Quad);
@@ -394,7 +366,6 @@
     int sessionId = sessionIdForTerminalId(terminalId);
 
     if (sessionId == -1) return;
-    if (!m_sessions.contains(sessionId)) return;
 
     m_sessions.value(sessionId)->splitLeftRight(terminalId);
 }
@@ -404,11 +375,46 @@
     int sessionId = sessionIdForTerminalId(terminalId);
 
     if (sessionId == -1) return;
-    if (!m_sessions.contains(sessionId)) return;
 
     m_sessions.value(sessionId)->splitTopBottom(terminalId);
 }
 
+int SessionStack::tryGrowTerminalRight(int terminalId, uint pixels)
+{
+    int sessionId = sessionIdForTerminalId(terminalId);
+
+    if (sessionId == -1) return -1;
+
+    return m_sessions.value(sessionId)->tryGrowTerminal(terminalId, Session::Right, pixels);
+}
+
+int SessionStack::tryGrowTerminalLeft(int terminalId, uint pixels)
+{
+    int sessionId = sessionIdForTerminalId(terminalId);
+
+    if (sessionId == -1) return -1;
+
+    return m_sessions.value(sessionId)->tryGrowTerminal(terminalId, Session::Left, pixels);
+}
+
+int SessionStack::tryGrowTerminalTop(int terminalId, uint pixels)
+{
+    int sessionId = sessionIdForTerminalId(terminalId);
+
+    if (sessionId == -1) return -1;
+
+    return m_sessions.value(sessionId)->tryGrowTerminal(terminalId, Session::Up, pixels);
+}
+
+int SessionStack::tryGrowTerminalBottom(int terminalId, uint pixels)
+{
+    int sessionId = sessionIdForTerminalId(terminalId);
+
+    if (sessionId == -1) return -1;
+
+    return m_sessions.value(sessionId)->tryGrowTerminal(terminalId, Session::Down, pixels);
+}
+
 void SessionStack::emitTitles()
 {
     QString title;