1
0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-16 07:47:58 +01:00
Commit Graph

50 Commits

Author SHA1 Message Date
Paul Licameli
94247cc650 Some comments in ToolDock.cpp 2018-01-22 12:14:02 -05:00
Paul Licameli
89d3d6e6e6 Comments and name changes to clarify code for toolbar configurations 2018-01-22 12:13:40 -05:00
David Bailes
516af71782 Fix for #1554: toolbars open undocked if previously hidden
Problem:
1. If a toolbar is docked and hidden, when config is written, dock is set to 0 (undocked).
2. When config is read, if a toolbar is docked, then the show field is ignored, and the toolbar is always shown.

Summary of fix:
1. Introduce a new version of the dock field (DockV2) to minimise the problems when running previous versions of Audacity, having run a version with this patch(as suggested by Paul).
2. In ToolManage::WriteConfig, for a docked toolbar which is hidden, DockV2 is set to the dock number, and not 0.
3. In ToolManager::ReadConfig, for a hidden docked toolbar in the config, the toolbar is docked, but is not included in the configuration.

Note, that if a version of Audacity without this fix is run after running a version with this fix:
1. The dock of each toolbar is reset to its default value.
2. In addition, for 2.1.3, 2.2.0 and 2.2.1 whether a toolbar is shown or hidden is reset to its default value.
2017-12-12 14:39:02 +00:00
Paul Licameli
ecd149edad Revert "Fix for #1554: toolbars open undocked if previously hidden"
This reverts commit 048c1b8c5a.

I observed that it was not all right if you switch between Audacity versions, as
some cautious upgraders might do:

Delete audacity.cfg.
Open 2.2.0 and quit.
Open 2.1.3 -- and observe that the scrubbing and combined meter toolbars appear,
one over the other, at top left.  Combined and separate meter toolbars are not
meant to appear at the same time.
Quit 2.1.3 and open 2.2.0.  Now those two toolbars appear at some other random
seeming positions.
2017-09-16 11:53:57 -04:00
David Bailes
048c1b8c5a Fix for #1554: toolbars open undocked if previously hidden
Summary of fix:
1. In ToolManger::WriteConfig, for a docked toolbar which is hidden, the dock number is not set to the dock number rather than 0 (undocked)
2. In ToolManger::ReadConfig, for a hidden docked toolbar in the config, the toolbar is docked, but is not included in the dock's configuration.
2017-09-13 12:53:32 +01:00
Paul Licameli
2d56c8ec32 Fix misbehavior of toolbars after click without drag on a grabber...
... only lately introduced at b3c8f5db3d
2017-07-24 12:35:24 -04:00
Paul Licameli
b3c8f5db3d Bug1432 partial: Dragging toolbar should't change focus...
... Only the case that you click the grabber and release, or you drag the
toolbar ending in a docked position.

Doesn't work yet when drag ends un-docked.
2017-07-23 13:49:03 -04:00
Paul Licameli
d88371b4b7 Revert stuff 2017-07-23 12:40:29 -04:00
Paul Licameli
ace1ac08e7 Bug1432, partial: Click on toolbar grabber, without drag, does nothing. 2017-07-23 09:49:58 -04:00
James Crook
c17a7f535e Improve repainting after a theme change.
Now most things repaint properly after a theme change.  The sliders on the tracks don't yet.
2017-04-04 14:43:47 +01:00
James Crook
028ed19d90 Sync with DarkAudacity 2017-04-02 23:07:13 +01:00
Darrell Walisser
d1b49952e9 Two Initialisations (Valgrind) 2017-03-01 22:39:27 +00:00
Paul Licameli
53936ac970 Fix some warnings for unused variables and labels...
... But not in cases where a return status is ignored.
2016-09-19 11:47:47 -04:00
Paul Licameli
981020a8fc Avoid unused parameter warnings 2016-09-18 10:36:55 -04:00
Paul Licameli
a52f7f8410 new -> NEW in comments, so text search for naked new excludes them 2016-08-08 10:07:37 -04:00
Paul Licameli
4739f3e27b Compensate for wxW 3 tab navigation deficiencies on Mac...
... using char hook event handlers.  We don't need to go the extreme length
of patching wxWidgets source.
2016-06-25 19:14:05 -04:00
Paul Licameli
8b966ae2c1 Merge branch 'master' of github.com:audacity/audacity 2016-06-15 07:19:09 -04:00
Paul Licameli
2a075558ce Suppress duplicate tool dock points that don't give distinct results 2016-06-13 19:15:43 -04:00
Paul Licameli
4aa380f82a Don't narrow toolbars on Windows when they re-dock 2016-06-13 14:46:19 -04:00
Paul Licameli
c3437b1d6e Fix Windows build, and some compilation warnings 2016-06-13 09:42:24 -04:00
Steve Daulton
78e16f6e20 include <algorithm> to fix Linux build 2016-06-13 08:38:54 +01:00
Paul Licameli
c101f4acdb Enable yet more docking positions by wrapping the cofiguration 2016-06-12 20:21:09 -04:00
Paul Licameli
de17c1ac3a Toolbar placements can push other bars down as well as right 2016-06-12 20:21:09 -04:00
Paul Licameli
37962dd9a8 Visitors unify layout routines; now any bar can stick at lower left 2016-06-12 20:20:51 -04:00
Paul Licameli
65b3d32894 Tool bar configuration stores a tree structure, not a simple sequence 2016-06-12 19:18:56 -04:00
Paul Licameli
7f920ecd0d Starting to make ToolBarConfiguration::Position more general 2016-06-12 12:41:52 -04:00
Paul Licameli
ffb681e658 Delegate reading and writing of toolbar configuration to new class 2016-06-12 10:55:47 -04:00
Paul Licameli
3c13c6eaa6 ToolDock::OnPaint assumes less about configuration details 2016-06-12 10:29:45 -04:00
Paul Licameli
b46e263afb Abstract ToolBarConfiguration further, with an iterator class 2016-06-12 10:27:54 -04:00
Paul Licameli
dd327cd304 More abstract toolbar positioning types, to be generalized later 2016-06-12 10:27:51 -04:00
Paul Licameli
036c13149b The two toolbar positioning functions are simpler and more similar 2016-06-12 08:25:45 -04:00
Paul Licameli
64ad732aee Removed some unused members, made some members const 2016-06-11 16:31:38 -04:00
Paul Licameli
82cf9b3ab6 Don't increase width when a toolbar is repeatedly docked and undocked 2016-06-11 16:29:25 -04:00
Paul Licameli
9ab0e42f29 Control scrub with motion, click, drag, wheel almost anywhere in main window...
... if the event is not handled and skipped by sub-windows first, such as for
toolbar button clicks.

(But track panel clicks are skipped even after doing something, so they may
also cause seeking besides other responses.  So click can seek AND set cursor.)

This is meant to make drag to seek and wheel for change of speed easier,
without needing to keep the mouse in the narrow time ruler.

Also lets you click in the ruler, then move in any direction, and not miss the
motion event that should start the scrub playback.

The event handling is a bit of a hack, using propagation.  It does not use
capture.
2016-04-26 12:12:06 -04:00
Paul Licameli
fad249a603 ESC key can abort the rearranging of toolbars. 2016-04-23 22:10:02 -04:00
Paul Licameli
7c4c45a0d5 "new"->"NEW" in comments, easier to find remaining naked operator new 2016-02-14 18:52:41 -05:00
lllucius@gmail.com
7c1535fdfd Always assign an order if a bar is docked
Otherwise, the next time Audacity is started, it will
become undocked.
2014-12-26 09:21:35 +00:00
lllucius@gmail.com
9404a28954 Fix missing toolbars at startup on Linux
The problem was that on Linux (not Windows or Mac) menu
events are generated when checking the menu items in
the toolbar menu.

Becuase of the recent changes I made and how the toolbars
are being shown (toggled) when the toolbar menu is checked,
they were simply being hidden.  Actually, the were being
shown and then hidden because of the toggle.

So, with this change I made exposing toolbars a bit more
deterministic.  The menus still use a toggle, but the 
ToolManager now shows or hides the bars explicitly during
setup, so the menu toggle issue is resolved.
2014-12-20 20:08:45 +00:00
james.k.crook@gmail.com
7ee3c47441 Added Space-Saver meters. These are now the default.
Fixed ResetToolbars so that SpectralSelectionBar is not shown after a reset.
2014-11-09 15:47:09 +00:00
james.k.crook@gmail.com
799230b882 Much easier to dock with an empty dock now.
Overlapping a dock is now enough to trigger docking.  Previously the top left corner had to be in the dock.
2014-11-02 17:39:50 +00:00
james.k.crook@gmail.com
8567775efb Fixed docking of large toolbars.
Previously there were three problems:
1) Docking marker calculation was relative to the mouse rather than relative to the top left of the dragged toolbar.  On a big toolbar dragged from the bottom of the dragger that could be a long way off.
2) Docking markers appeared too low down.  Their position was relative to the middle of the dragged toolbar.  However as the toolbar may be resized on placement that does not make sense.
3) Large (Height()>120) toolbars could be thought to be too tall to dock in some places.  The positioning code used their current size rather than their minimum size.
2014-10-24 18:18:51 +00:00
james.k.crook@gmail.com
e31644eda8 Fix: Can now drag double height toolbars onto start of last row, even when last row is single height.
I also simplified the code by (a) exiting from a loop as soon as we know the answer and by (b) not treating the initial case of a loop as 'special'.
2014-10-21 16:36:32 +00:00
james.k.crook@gmail.com
2c5d9ef569 Comments and new variables in ToolDocking code. No change to function. 2014-10-21 14:17:42 +00:00
benjamin.drung@gmail.com
277932dccb Remove trailing spaces. 2014-06-03 20:30:19 +00:00
martynshaw99
4ce2643d5f Remove the
// Indentation settings for Vim and Emacs
etc. lines from all files, as Campbell's patch (except for other changes to Languages.cpp)
2013-09-24 00:14:37 +00:00
james.k.crook@gmail.com
dba81b3f1c Cleanup: Fixed lots of trivial MSVC warnings. 2013-08-25 21:51:26 +00:00
v.audacity
c26b3c6b49 Campbell Barton's further patch to turn many, many tabs to our 3-space convenbtion 2013-02-23 04:33:20 +00:00
mchinen
fff977b942 ToolBar.cpp: remove excessive drawing on reset (as well as other resizing/positioning functions.)
Was causing an issue with the DeviceToolBar (discussed in bug 11,) but this change will speed up redraw of other toolbars as well.
2011-02-05 14:16:44 +00:00
mchinen
350b96038c bug 11 followup: fix sizing and positioning issues. Also autoresizes now. 2011-01-17 04:17:25 +00:00
ra
e74978ba77 Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches 2010-01-23 19:44:49 +00:00