~aleteoryx/muditaos

d45c23d8c2c7c31903e2d1e74157c03bafe580ae — Maciej Janicki 4 years ago 1220a09
[BH-1037] Fix popup not working

Fix not working activate/deactivate popup
M products/BellHybrid/services/evtmgr/internal/key_sequences/AlarmActivateSequence.hpp => products/BellHybrid/services/evtmgr/internal/key_sequences/AlarmActivateSequence.hpp +3 -3
@@ 3,11 3,11 @@

#pragma once

#include "ReleaseSequence.hpp"
#include "MovedSequence.hpp"

class AlarmActivateSequence : public ReleaseSequence
class AlarmActivateSequence : public MovedSequence
{
  public:
    AlarmActivateSequence() : ReleaseSequence(KeyMap::DeepPressUp)
    AlarmActivateSequence() : MovedSequence(KeyMap::DeepPressUp)
    {}
};

M products/BellHybrid/services/evtmgr/internal/key_sequences/AlarmDeactivateSequence.hpp => products/BellHybrid/services/evtmgr/internal/key_sequences/AlarmDeactivateSequence.hpp +3 -3
@@ 3,11 3,11 @@

#pragma once

#include "ReleaseSequence.hpp"
#include "MovedSequence.hpp"

class AlarmDeactivateSequence : public ReleaseSequence
class AlarmDeactivateSequence : public MovedSequence
{
  public:
    AlarmDeactivateSequence() : ReleaseSequence(KeyMap::DeepPressDown)
    AlarmDeactivateSequence() : MovedSequence(KeyMap::DeepPressDown)
    {}
};

A products/BellHybrid/services/evtmgr/internal/key_sequences/MovedSequence.hpp => products/BellHybrid/services/evtmgr/internal/key_sequences/MovedSequence.hpp +28 -0
@@ 0,0 1,28 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md

#pragma once

#include "AbstractKeySequence.hpp"
#include <keymap/KeyMap.hpp>

class MovedSequence : public AbstractKeySequence
{
  public:
    explicit MovedSequence(KeyMap key) : mappedKey{key}
    {}
    void process(const RawKey &key) override
    {
        if (mapKey(static_cast<gui::KeyCode>(key.keyCode)) != mappedKey) {
            return;
        }

        if (key.state == RawKey::State::Moved) {
            trigger();
            ready();
        }
    }

  private:
    KeyMap mappedKey;
};