smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-22 22:56:32 +01:00
Code Issues Projects Releases Wiki Activity

minor fixes from OSX land

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2725 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-11-29 02:18:39 +00:00
parent b7e01e92b3
commit 77a9dd73e6
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/editor.cc
View file

@ -280,7 +280,8 @@ Editor::Editor ()
verbose_cursor_on = true; verbose_cursor_on = true;
route_removal = false; route_removal = false;
show_automatic_regions_in_region_list = true; show_automatic_regions_in_region_list = true;
region_list_sort_type = (Editing::RegionListSortType) 0;
region_list_sort_type = (Editing::RegionListSortType) 0;
have_pending_keyboard_selection = false; have_pending_keyboard_selection = false;
_follow_playhead = true; _follow_playhead = true;
_xfade_visibility = true; _xfade_visibility = true;
@ -2595,8 +2596,11 @@ Editor::setup_toolbar ()
{ {
string pixmap_path; string pixmap_path;
#ifdef GTKOSX
const guint32 FUDGE = 38; // Combo's are stupid - they steal space from the entry for the button
#else
const guint32 FUDGE = 18; // Combo's are stupid - they steal space from the entry for the button const guint32 FUDGE = 18; // Combo's are stupid - they steal space from the entry for the button
#endif
/* Mode Buttons (tool selection) */ /* Mode Buttons (tool selection) */

2
gtk2_ardour/keyboard.cc
View file

@ -43,7 +43,7 @@ guint Keyboard::delete_but = 3;
guint Keyboard::delete_mod = GDK_SHIFT_MASK; guint Keyboard::delete_mod = GDK_SHIFT_MASK;
guint Keyboard::snap_mod = GDK_MOD3_MASK; guint Keyboard::snap_mod = GDK_MOD3_MASK;
#ifdef NATIVE_OSX_KEYS #ifdef GTKOSX
guint Keyboard::PrimaryModifier = GDK_MOD1_MASK; // Command guint Keyboard::PrimaryModifier = GDK_MOD1_MASK; // Command
guint Keyboard::SecondaryModifier = GDK_MOD5_MASK; // Alt/Option guint Keyboard::SecondaryModifier = GDK_MOD5_MASK; // Alt/Option
guint Keyboard::TertiaryModifier = GDK_SHIFT_MASK; // Shift guint Keyboard::TertiaryModifier = GDK_SHIFT_MASK; // Shift