Cannot switch layout by clicking layout icon using mouse button

[nslynx]

Describe the bug

Cannot switch layout by clicking layout icon using mouse button

To Reproduce

1. Start session
2. Use shortcut to see layout switching icon
3. Click it by mouse buttons
4. No reaction

Expected behavior

Layouts must be switched by mouse button as it is done by using shortcut

deepin 15.8

[listenerri]

That is not a bug.
The keyboard layout indicator does not support mouse events, do we need support it? @hualet

[hualet]

That is not a bug.
The keyboard layout indicator does not support mouse events, do we need support it? @hualet

It did support that long time ago until @justforlxz rewrote it.

[nslynx]

I think, it should support mouse events, as it supports it in Plasma/Win7/Cinnamon etc, with
LMB: simple switching (the same as clicking shortcut)
RMB: small context menu with list of layouts and "settings" option.
@hualet @listenerri

[listenerri]

@tribunal2000
Ok, it will be fixed later

[listenerri]

https://cr.deepin.io/c/dde/dde-dock/+/41872

[liuwen123]

+1

[nslynx]

May be you should use button value like this?

(pseudo code, using my style (it looks lix mix of google and Qt style))
(May be I am wrong and should use sources to compile, but this is just a small suggestion)

void DBusAdaptors::onClicked(int button, int x, int y) {
  if (m_userLayoutList.size() < 2) 
      return;

  int oldLayoutIndex = newLayoutIndex = m_userLayoutList.indexOf(m_currentLayout); 
   switch (button)   {
     case LEFT_BUTTON:
     case SCROLL_DOWN:
          newLayoutIndex++;
       if (newLayoutIndex  >= m_userLayoutList.size())
          newLayoutIndex = 0;
       break;
     case SCROLL_UP:
       newLayoutIndex--;
       if (newLayoutIndex < 0)
       newLayoutIndex = m_userLayout.size() - 1;
       break;
      case RIGHT_BUTTON:
      case MIDDLE_BUTTON:
       if (m_menu) {
          m_menu->exec(QPoint(x, y));
          return;
       }
       break;
    default:
       break;
   }

  if (oldLayoutIndex != newLayoutIndex)
 {
    QString newLayout = m_userLayoutList.at(newLayoutIndex);
      m_keyboard->setCurrentLayout(newLayout);
       emit LayoutChanged (newLayout);
 }
}

Sorry, tabs and spaces of formatting code have lost :(

[hualet]

@tribunal2000 you can use ``` to quote your code.

[nslynx]

Thank you 👍 Now looks much better

[liuwen123]

已修复