@@ -3935,6 +3935,7 @@ def __init__(self, parent, ID, app_dir, settings, options):
3935
3935
self .find_data .SetFlags (wx .FR_DOWN )
3936
3936
self .execmessage_time = datetime .now () # 1.3.6 [SS] 2014-12-11
3937
3937
self .is_fullscreen = False
3938
+ self .score_is_maximized = False
3938
3939
3939
3940
self .load_settings ()
3940
3941
settings = self .settings
@@ -4045,6 +4046,8 @@ def __init__(self, parent, ID, app_dir, settings, options):
4045
4046
#self.manager.AddPane(self.error_msg, self.error_pane)
4046
4047
self .manager .AddPane (self .abc_assist_panel , self .assist_pane )
4047
4048
self .manager .Bind (aui .EVT_AUI_PANE_CLOSE , self .__onPaneClose )
4049
+ self .manager .Bind (aui .EVT_AUI_PANE_MAXIMIZE , self .__onPaneMaximize )
4050
+ self .manager .Bind (aui .EVT_AUI_PANE_RESTORE , self .__onPaneRestore )
4048
4051
4049
4052
self .manager .Update ()
4050
4053
@@ -4089,6 +4092,9 @@ def __init__(self, parent, ID, app_dir, settings, options):
4089
4092
self .editor .CmdKeyAssign (ord ('+' ), stc .STC_SCMOD_CTRL , stc .STC_CMD_ZOOMIN )
4090
4093
self .editor .CmdKeyAssign (ord ('-' ), stc .STC_SCMOD_CTRL , stc .STC_CMD_ZOOMOUT )
4091
4094
self .music_pane .Bind (wx .EVT_LEFT_DCLICK , self .OnMusicPaneDoubleClick )
4095
+ self .music_pane .Bind (wx .EVT_LEFT_DOWN , self .OnMusicPaneClick )
4096
+ self .music_pane .Bind (wx .EVT_RIGHT_DOWN , self .OnRightClickMusicPane )
4097
+
4092
4098
#self.music_pane.Bind(wx.EVT_KEY_DOWN, self.OnMusicPaneKeyDown)
4093
4099
4094
4100
self .load_and_apply_settings (load_window_size_pos = True )
@@ -5572,8 +5578,29 @@ def OnMoveTuneDown(self, evt):
5572
5578
self .tune_list .DeselectAll ()
5573
5579
self .MoveTune (selected_index , selected_index + 1 )
5574
5580
5581
+ def OnMusicPaneClick (self , evt ):
5582
+ if self .score_is_maximized :
5583
+ width , height = self .music_pane .Size
5584
+ x , y = evt .Position
5585
+ threshold = width / 4
5586
+ new_page = - 1
5587
+
5588
+ if x < threshold :
5589
+ new_page = self .current_page_index - 1
5590
+ elif x > (width - threshold ):
5591
+ new_page = self .current_page_index + 1
5592
+
5593
+ if 0 <= new_page < self .current_svg_tune .page_count and new_page != self .current_page_index :
5594
+ self .select_page (new_page )
5595
+ return
5596
+
5597
+ evt .Skip ()
5598
+
5599
+ def OnRightClickMusicPane (self , evt ):
5600
+ if self .score_is_maximized :
5601
+ self .toggle_fullscreen (evt )
5602
+
5575
5603
def OnMusicPaneDoubleClick (self , evt ):
5576
- self .toggle_fullscreen (evt )
5577
5604
self .editor .SetFocus ()
5578
5605
5579
5606
def toggle_fullscreen (self , evt ):
@@ -5724,6 +5751,14 @@ def __onPaneClose(self, evt):
5724
5751
self .search_files_panel .focus_find_what ()
5725
5752
self .search_files_panel .clear_results ()
5726
5753
5754
+ def __onPaneMaximize (self , evt ):
5755
+ if evt .pane .window == self .music_pane :
5756
+ self .score_is_maximized = True
5757
+
5758
+ def __onPaneRestore (self , evt ):
5759
+ if evt .pane .window == self .music_pane :
5760
+ self .score_is_maximized = False
5761
+
5727
5762
# def OnToolDynamics(self, evt):
5728
5763
# try: self.toolbar.PopupMenu(self.popup_dynamics)
5729
5764
# except wx._core.PyAssertionError: pass
0 commit comments