Merge branch 'gtp-engines'

SabakiHQ · Sep 7, 2015 · 8ffd257 · 8ffd257
2 parents 9e8d95b + 05e28d6
commit 8ffd257
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 5 deletions.
diff --git a/main.js b/main.js
@@ -28,6 +28,7 @@ setting
 .default('sound.enable', true)
 .default('view.comments_height', 50)
 .default('view.comments_minheight', 20)
+.default('view.console_width', 400)
 .default('view.fuzzy_stone_placement', true)
 .default('view.show_comments', false)
 .default('view.show_coordinates', false)

diff --git a/style/index.css b/style/index.css
@@ -156,6 +156,22 @@ header, #edit, #scoring, #find, #progress {
         margin-top: -10px;
 }
 
+#console {
+        display: none;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        width: 400px;
+        background: #111;
+    }
+    .console #console {
+        display: block;
+    }
+    .console #main {
+        left: 400px;
+}
+
 #sidebar {
         display: none;
         position: absolute;

diff --git a/view/index.html b/view/index.html
@@ -18,6 +18,17 @@
 </head>
 <body>
 
+<section id="console">
+    <div class="verticalresizer"></div>
+
+    <div class="gm-scrollbar -vertical"><div class="thumb"></div></div>
+    <div class="gm-scrollbar -horizontal"><div class="thumb"></div></div>
+    <div class="gm-scroll-view">
+        <div class="inner">
+        </div>
+    </div>
+</section>
+
 <section id="main">
     <section id="goban" class="goban">
         <div></div>

diff --git a/view/index.view.js b/view/index.view.js
@@ -59,6 +59,27 @@ function setShowCoordinates(show) {
     getMainMenu().items[3].submenu.items[1].checked = show
 }
 
+function getShowConsole() {
+    return document.body.hasClass('console')
+}
+
+function setShowConsole(show) {
+    if (getShowConsole() == show) return
+    if (show) document.body.addClass('console')
+    else document.body.removeClass('console')
+
+    $('console').setStyle('width', setting.get('view.console_width'))
+    $('main').setStyle('left', show ? setting.get('view.console_width') : 0)
+
+    // Resize window
+    var win = remote.getCurrentWindow()
+    var size = win.getContentSize()
+
+    if (!win.isMaximized())
+        win.setContentSize(size[0] + (show ? 1 : -1) * setting.get('view.console_width'), size[1])
+    resizeBoard()
+}
+
 function getShowSidebar() {
     return document.body.hasClass('sidebar')
 }
@@ -88,10 +109,10 @@ function setShowSidebar(show) {
     // Resize window
     var win = remote.getCurrentWindow()
     var size = win.getContentSize()
-    resizeBoard()
 
-    if (win.isMaximized()) return
-    win.setContentSize(size[0] + (show ? 1 : -1) * setting.get('view.sidebar_width'), size[1])
+    if (!win.isMaximized())
+        win.setContentSize(size[0] + (show ? 1 : -1) * setting.get('view.sidebar_width'), size[1])
+    resizeBoard()
 }
 
 function getSidebarArrangement() {
@@ -852,9 +873,9 @@ document.addEvent('domready', function() {
 
     // Resize sidebar
 
-    $$('#sidebar .verticalresizer').addEvent('mousedown', function() {
+    $$('.verticalresizer').addEvent('mousedown', function() {
         if (event.button != 0) return
-        $('sidebar').store('initposx', new Tuple(event.x, getSidebarWidth()))
+        this.getParent().store('initposx', new Tuple(event.x, getSidebarWidth()))
     })
     $$('#sidebar .horizontalresizer').addEvent('mousedown', function() {
         if (event.button != 0) return