Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Deere 2.1 layout & color fixes #15

Merged
merged 7 commits into from
Nov 19, 2017
Merged

Deere 2.1 layout & color fixes #15

merged 7 commits into from
Nov 19, 2017

Conversation

ronso0
Copy link

@ronso0 ronso0 commented Nov 12, 2017

  • removing now obsolete FullControlsRow
  • equalize padding/layout-spacing in contrlos row & overview row

I closed #14 and included the commit here

@ronso0 ronso0 changed the title Deere 2.1 layout fixes Deere 2.1 layout & color fixes Nov 12, 2017
@nopeppermint
Copy link

it seems to me like there are some more color fixes required (if the goal is to have everything selected with a blue background):
before this fix:
linux_mint_18 2
with this fix:
dere_new_fix

deree_fix_3

So basically:

  • the preview button
  • some empty spaces on the left (AutoDJ/Crates, Playlists, Crates/New Crates, Computer/all submenus, Recordings, History/all submenus, Analyse)

@nopeppermint nopeppermint mentioned this pull request Nov 12, 2017
Merged
8 tasks
@ronso0
Copy link
Author

ronso0 commented Nov 12, 2017

So basically:

  • the preview button
  • some empty spaces on the left (AutoDJ/Crates, Playlists, Crates/New Crates, ...)

Ooh, will fix the preview button.
But I don't know what to do about that empty space in Lib tree. I can recall that I tried to fix that in Tango ages ago

@ronso0
Copy link
Author

ronso0 commented Nov 12, 2017

For the branches in Lib tree I could fix it, but for the Preview button there's already a style hack in legacyskinparser.cpp. Right now I'm trying if this is avoiding qss style.

@ronso0
Copy link
Author

ronso0 commented Nov 12, 2017

I fixed the empty space in tree.
But I don't find a way to define the Preview button background according to row selection.
For now I used the 'alternate-background-color' (every second line in Library) an change it to blue if the respective track is playing. This looks nice and may even help to find the playing track in case the Preview deck is not visible and that track is scrolled out of view.

Maybe someone else has an idea how to fix this with qss only.

@nopeppermint
Copy link

thanks @ronso0 now it looks like this:
with_fix

nopeppermint
nopeppermint reviewed Nov 12, 2017
View reviewed changes
res/skins/Deere/style.qss
}

QPushButton#LibraryPreviewButton:checked {
image: url(skin:/image/style_library_preview_pause.png);
background-color: #006596;
Copy link

@nopeppermint nopeppermint Nov 12, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest

"228 background-color: mixxxdj#6596;"

then It looks like this:
new_fix

which is (in my opinion) better than

with_fix

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Blue might be better if Preview deck is not visible and if you scroll around a lot while previewing.
Dark grey looks better but breaks the highlighted line, depending on how columns are sorted.
I don't mind..

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Be-ing What do you think?

Copy link
Owner

@Be-ing Be-ing Nov 19, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the background of the preview icon for a deck playing in the preview deck should be different from both the highlight background color and the unselected background color.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, I like it how it is. It jumps out a little bit, but not too much.

@ronso0
Copy link
Author

ronso0 commented Nov 13, 2017

Don't merge yet, I'll add commits to fix the flickering when toggling parallel waveforms I discovered while checking Bug #1731791

@ronso0
Copy link
Author

ronso0 commented Nov 13, 2017

Done.

@ronso0
Copy link
Author

ronso0 commented Nov 14, 2017

= Ready to merge

@ronso0
Copy link
Author

ronso0 commented Nov 17, 2017 •
edited
Loading

@Be-ing Did you have a look at this yet?
Let's decide about the Preview button,

then merge this so Deere update get's finished

@Be-ing Be-ing merged commit 10768df into Be-ing:deere_2.1_part_2 Nov 19, 2017
@Be-ing
Copy link
Owner

Be-ing commented Nov 19, 2017

LGTM thank you

@ronso0 ronso0 deleted the deere_2.1_layout-fixes branch November 24, 2017 18:38
Be-ing pushed a commit that referenced this pull request Apr 14, 2020
@rryan
Merge pull request #15 from daschuer/qopenglwidget
319d5fd 
resolve conflicts, Fix OpenGL status
Be-ing pushed a commit that referenced this pull request Apr 19, 2020
@ferranpujolcamins
Merge pull request #15 from Holzhaus/bulk-controller-fix
97d5623 
controllers/bulk: Fix BulkController constructor
Be-ing pushed a commit that referenced this pull request Jun 14, 2020
@uklotzde
Merge pull request #15 from daschuer/faad2
c775f33 
Faad2 + CMake
Be-ing pushed a commit that referenced this pull request Apr 8, 2022
@Holzhaus
EngineBuffer: Fix assert when new track is loaded during playback wit…
9614a8f 
…h sync

When loading a track that is not yet present in the library (and thus
doesn't have any BPM because it hasn't been analyzed yet) while another
deck is playing and both decks have sync enabled, a debug assertion is
triggered:

    DEBUG ASSERT: "isValid()" in function double mixxx::Bpm::value() const at src/track/bpm.h:53
    Aborted (core dumped)

The backtrace looks as follows:

    #0  0x00007f175c87234c in __pthread_kill_implementation () at /usr/lib/libc.so.6
    #1  0x00007f175c8254b8 in raise () at /usr/lib/libc.so.6
    #2  0x00007f175c80f534 in abort () at /usr/lib/libc.so.6
    #3  0x00007f175cf05ee4 in qt_assert(char const*, char const*, int) () at /usr/lib/libQt5Core.so.5
    #4  0x000055deb2e67e1c in mixxx::(anonymous namespace)::handleMessage(QtMsgType, QMessageLogContext const&, QString const&) (type=<optimized out>, context=<optimized out>, input=<optimized out>) at src/util/logging.cpp:355
    #5  0x00007f175cf47128 in  () at /usr/lib/libQt5Core.so.5
    #6  0x00007f175cf3fd8a in  () at /usr/lib/libQt5Core.so.5
    #7  0x00007f175cf06526 in QMessageLogger::critical(char const*, ...) const () at /usr/lib/libQt5Core.so.5
    #8  0x000055deb2e5c720 in mixxx_debug_assert(char const*, char const*, int, char const*) (assertion=assertion@entry=0x55deb39bd0db "isValid()", file=file@entry=0x55deb39bbf30 "src/track/bpm.h", line=line@entry=53, function=function@entry=0x55deb39bbf08 "double mixxx::Bpm::value() const") at gsrc/util/assert.h:9
    #9  0x000055deb2ee7e7e in mixxx_debug_assert_return_true(char const*, char const*, int, char const*) (function=0x55deb39bbf08 "double mixxx::Bpm::value() const", line=53, file=0x55deb39bbf30 "src/track/bpm.h", assertion=0x55deb39bd0db "isValid()") at gsrc/util/assert.h:18
    #10 mixxx::Bpm::value() const (this=<synthetic pointer>) at src/track/bpm.h:53
    #11 mixxx::operator*(mixxx::Bpm, double) (multiple=1, bpm=...) at src/track/bpm.h:160
    #12 SyncControl::setLocalBpm(mixxx::Bpm) (this=<optimized out>, localBpm=...) at src/engine/sync/synccontrol.cpp:567
    #13 0x000055deb34c7ba3 in EngineBuffer::postProcess(int) (this=0x55deb56eb060, iBufferSize=2048) at src/engine/enginebuffer.cpp:1318
    #14 0x000055deb3139023 in EngineMaster::processChannels(int) (this=0x55deb5449440, iBufferSize=<optimized out>) at src/engine/enginemaster.cpp:383
    #15 0x000055deb31394f7 in EngineMaster::process(int) (this=0x55deb5449440, iBufferSize=iBufferSize@entry=2048) at src/engine/enginemaster.cpp:410
    #16 0x000055deb2f91d0b in SoundManager::onDeviceOutputCallback(long) (this=<optimized out>, iFramesPerBuffer=iFramesPerBuffer@entry=1024) at src/soundio/soundmanager.cpp:596
    #17 0x000055deb32dd794 in SoundDevicePortAudio::callbackProcessClkRef(long, float*, float const*, PaStreamCallbackTimeInfo const*, unsigned long) (this=0x55deb553e6b0, framesPerBuffer=1024, out=<optimized out>, in=<optimized out>, timeInfo=<optimized out>, statusFlags=<optimized out>) at src/soundio/sounddeviceportaudio.cpp:965

This happens because `newLocalBpm` is invalid when `localBpm` is
invalid. Trying to do sync decks while no tempo information is available
does not make sense, so we only synchronize decks if the local BPM is
available.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nopeppermint nopeppermint nopeppermint left review comments

@Be-ing Be-ing Be-ing left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ronso0 @nopeppermint @Be-ing