diff options
-rw-r--r-- | Edit/MainWindow.py | 5 | ||||
-rw-r--r-- | Jam/Toolbars.py | 6 | ||||
-rw-r--r-- | Util/ThemeWidgets.py | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py index dc284e6..58f82f1 100644 --- a/Edit/MainWindow.py +++ b/Edit/MainWindow.py @@ -2053,14 +2053,13 @@ class InstrumentButton( gtk.DrawingArea ): def set_palette(self, palette): self._palette = palette self._palette.props.invoker = WidgetInvoker(self) + self._palette.props.invoker._position_hint = WidgetInvoker.AT_CURSOR #This is a hack, will change with newer Palette API class instrumentPalette(Palette): def __init__(self, label, trackID, edit): Palette.__init__(self, label) - - self.set_property( "position", Palette.AT_CURSOR ) - + self.trackID = trackID self.edit = edit diff --git a/Jam/Toolbars.py b/Jam/Toolbars.py index f76f691..8c6abe8 100644 --- a/Jam/Toolbars.py +++ b/Jam/Toolbars.py @@ -48,13 +48,15 @@ class JamToolbar( gtk.Toolbar ): self.show_all() - def _add_palette( self, widget, palette, position = Palette.DEFAULT ): + #def _add_palette( self, widget, palette, position = Palette.DEFAULT ): + def _add_palette( self, widget, palette ): widget._palette = palette widget._palette.props.invoker = WidgetInvoker( widget ) widget._palette.set_property( "position", position ) def _add_tooltip( self, widget, tooltip ): - self._add_palette( widget, Palette( tooltip ), Palette.DEFAULT ) + #self._add_palette( widget, Palette( tooltip ), Palette.DEFAULT ) + self._add_palette( widget, Palette( tooltip ) ) def _insert_widget( self, widget, pos ): self.toolItem[ widget ] = gtk.ToolItem() diff --git a/Util/ThemeWidgets.py b/Util/ThemeWidgets.py index 06828ca..0acc498 100644 --- a/Util/ThemeWidgets.py +++ b/Util/ThemeWidgets.py @@ -863,6 +863,7 @@ class ImageButton(gtk.Button): def set_palette(self, palette): self._palette = palette self._palette.props.invoker = WidgetInvoker(self) + self._palette.props.invoker._position_hint = WidgetInvoker.AT_CURSOR class ImageToggleButton(gtk.ToggleButton): @@ -1021,6 +1022,7 @@ class ImageToggleButton(gtk.ToggleButton): def set_palette(self, palette): self._palette = palette self._palette.props.invoker = WidgetInvoker(self) + self._palette.props.invoker._position_hint = WidgetInvoker.AT_CURSOR class ImageRadioButton(gtk.RadioButton): @@ -1179,6 +1181,7 @@ class ImageRadioButton(gtk.RadioButton): def set_palette(self, palette): self._palette = palette self._palette.props.invoker = WidgetInvoker(self) + self._palette.props.invoker._position_hint = WidgetInvoker.AT_CURSOR class keyButton(gtk.Button): import cairo |