fix horisontal alignment of Instrumants in Mini

2 files changed, 13 insertions, 17 deletions

diff --git a/TamTamMini.activity/Mini/InstrumentPanel.py b/TamTamMini.activity/Mini/InstrumentPanel.py
index ca799cb..8271c70 100644
--- a/TamTamMini.activity/Mini/InstrumentPanel.py
+++ b/TamTamMini.activity/Mini/InstrumentPanel.py
@@ -12,7 +12,7 @@ from common.Util import InstrumentDB
 from common.Util.ScrolledToolbar import ScrolledToolbar
 import sugar.graphics.style as style
 
-InstrumentSize = 110
+InstrumentSize = 116
 Tooltips = Config.Tooltips
 
 class InstrumentPanel( gtk.EventBox ):
@@ -247,16 +247,18 @@ class InstrumentPanel( gtk.EventBox ):
     def loadInstrumentViewport( self ):
         self.instrumentBox = RoundHBox(fillcolor = Config.INSTRUMENT_GRID_COLOR, bordercolor = Config.PANEL_BCK_COLOR, radius = Config.PANEL_RADIUS)
 
-        self.scrollWin = gtk.ScrolledWindow()
-        self.scrollWin.set_policy(gtk.POLICY_NEVER,gtk.POLICY_AUTOMATIC)
-
         self.tableEventBox = gtk.EventBox()
         color = gtk.gdk.color_parse(Config.INSTRUMENT_GRID_COLOR)
         self.tableEventBox.modify_bg(gtk.STATE_NORMAL, color)
 
-        self.scrollWin.add_with_viewport(self.tableEventBox)
+        scrollwin = gtk.ScrolledWindow()
+        scrollwin.set_policy(gtk.POLICY_NEVER,gtk.POLICY_AUTOMATIC)
+        scrollwin.add_with_viewport(self.tableEventBox)
+        alignment = gtk.Alignment(1, 0, 0, 1)
+        alignment.add(scrollwin)
+
         self.tableEventBox.get_parent().set_shadow_type( gtk.SHADOW_NONE )
-        self.instrumentBox.pack_start(self.scrollWin,True,True,0)
+        self.instrumentBox.pack_start(alignment, True, True, 0)
         self.mainVBox.pack_start(self.instrumentBox)
         self.show_all()
 
diff --git a/TamTamMini.activity/Mini/miniTamTamMain.py b/TamTamMini.activity/Mini/miniTamTamMain.py
index a71463a..6a3c1c8 100644
--- a/TamTamMini.activity/Mini/miniTamTamMain.py
+++ b/TamTamMini.activity/Mini/miniTamTamMain.py
@@ -89,15 +89,14 @@ class miniTamTamMain(gtk.EventBox):
         self.mainWindowBox = gtk.HBox()
         self.leftBox = gtk.VBox()
         self.rightBox = gtk.VBox()
-        self.mainWindowBox.pack_start(self.rightBox,True,True)
-        self.mainWindowBox.pack_start(self.leftBox,False,False)
+        self.mainWindowBox.pack_start(self.rightBox, False, True)
+        self.mainWindowBox.pack_start(self.leftBox, True, True)
         self.masterVBox.pack_start(self.mainWindowBox)
         self.add(self.masterVBox)
 
         self.enableKeyboard()
         self.setInstrument(self.instrument)
 
-        self.drawInstrumentButtons()
         self.drawGeneration()
         self.show_all()
         if 'a good idea' == True:
@@ -285,7 +284,7 @@ class miniTamTamMain(gtk.EventBox):
         drum_size = generationDrumBtn1.get_size_request()
         geneButtonBox.set_size_request(-1, drum_size[1]*3 +
                 max(generateBtn.get_size_request()[1], self.playButton.get_size_request()[1]))
-        self.rightBox.set_size_request(drum_size[0]*3, -1)
+        self.rightBox.set_size_request(drum_size[0]*2, -1)
 
     def loopSettingsChannel(self, channel, value):
         self.csnd.setChannel(channel, value)
@@ -305,19 +304,14 @@ class miniTamTamMain(gtk.EventBox):
     def load_ls_instrument(self, soundName):
         self.csnd.load_ls_instrument(soundName)
 
-    def drawInstrumentButtons(self):
-        self.instrumentPanelBox = gtk.HBox()
-        # InstrumentPanel(elf.setInstrument,self.playInstrumentNote, False, self.micRec, self.synthRec)
-        self.leftBox.pack_start(self.instrumentPanelBox,True,True,6)
-
     def setInstrumentPanel( self, instrumentPanel ):
         width = gtk.gdk.screen_width() - self.rightBox.get_size_request()[0]
         instrumentPanel.configure( self.setInstrument,self.playInstrumentNote, False, self.micRec, width = width )
         self.instrumentPanel = instrumentPanel
-        self.instrumentPanelBox.pack_start( instrumentPanel )
+        self.leftBox.pack_start( instrumentPanel )
 
     def releaseInstrumentPanel( self ):
-        self.instrumentPanelBox.remove( self.instrumentPanel )
+        self.leftBox.remove( self.instrumentPanel )
 
     def micRec(self, widget, mic):
         if os.path.isfile(Config.DATA_DIR + '/' + mic):