1. 13 Sep, 2017 1 commit
    • Thomas Hartmann's avatar
      QmlDesigner: Change selection in the release event · f439183c
      Thomas Hartmann authored
      We already change the selection currently in the press event,
      which leads wo weird behaivour if e.g. shift is pressed.
      In this case the item is immediately unselected which is unexpected
      and cannot be moved anymore.
      Generally reacting to the event in the release event is the correct way
      to do it.
      
      Change-Id: Ib765f97f85e5dbeb6148d48f8640f1798a057b48
      Reviewed-by: Tim Jenssen's avatarTim Jenssen <tim.jenssen@qt.io>
      f439183c
  2. 09 Aug, 2017 1 commit
  3. 26 Jul, 2017 1 commit
    • Nikita Baryshnikov's avatar
      QmlDesigner fix parentheses warning · 5d362a4d
      Nikita Baryshnikov authored
      /src/plugins/qmldesigner/components/formeditor/selectiontool.cpp:145:
      warning: suggest parentheses around '&&' within '||' [-Wparentheses]
                       || selectedItemCursorInMovableArea(event->scenePos())
                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                       && !event->modifiers().testFlag(Qt::ControlModifier)
                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                       && !event->modifiers().testFlag(Qt::ShiftModifier)) {
                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      
      Change-Id: Iea6018d885b9bad13363a39e2aee0e6e229f93c4
      Reviewed-by: Thomas Hartmann's avatarThomas Hartmann <thomas.hartmann@qt.io>
      Reviewed-by: Tim Jenssen's avatarTim Jenssen <tim.jenssen@qt.io>
      5d362a4d
  4. 19 Jul, 2017 1 commit
    • Thomas Hartmann's avatar
      QmlDesigner: Refine selection · 9c2f2bed
      Thomas Hartmann authored
      This is a major overhaul of the slection logic.
      We do not change to the move tool automatically once
      the curser enters the selected item. This allows selection
      of items that are at the same position as the current selected item.
      
      The selected item can still be moved if there is no pissible candidate for
      selection. Also the border and gizmo always allows an item to be moved, if
      the item is fully covered by another item.
      
      Change-Id: Ic97a2bf23f33fcc5e209248aeb2f97df67bd23e1
      Reviewed-by: Tim Jenssen's avatarTim Jenssen <tim.jenssen@qt.io>
      9c2f2bed
  5. 09 Jan, 2017 1 commit
  6. 11 Oct, 2016 1 commit
  7. 19 Jan, 2016 1 commit
  8. 18 Sep, 2015 1 commit
  9. 17 Jul, 2015 1 commit
  10. 16 Jan, 2015 1 commit
  11. 09 Oct, 2014 1 commit
  12. 05 Aug, 2014 1 commit
  13. 22 Jul, 2014 1 commit
  14. 08 Jan, 2014 1 commit
  15. 02 Jan, 2014 1 commit
  16. 14 Oct, 2013 1 commit
  17. 18 Sep, 2013 1 commit
  18. 11 Sep, 2013 1 commit
  19. 04 Sep, 2013 2 commits
  20. 03 Sep, 2013 1 commit
  21. 25 Jul, 2013 1 commit
  22. 17 Jul, 2013 1 commit
  23. 30 Apr, 2013 1 commit
  24. 22 Apr, 2013 1 commit
  25. 04 Apr, 2013 1 commit
  26. 25 Mar, 2013 1 commit
  27. 18 Mar, 2013 1 commit
  28. 29 Jan, 2013 1 commit
  29. 08 Jan, 2013 1 commit
    • Orgad Shaneh's avatar
      Remove braces for single lines of conditions · 29a93998
      Orgad Shaneh authored
      #!/usr/bin/env ruby
      
      Dir.glob('**/*.cpp') { |file|
        # skip ast (excluding paste, astpath, and canv'ast'imer)
        next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
        s = File.read(file)
        next if s.include?('qlalr')
        orig = s.dup
        s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
          res = $&
          if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
            res
          else
            res.gsub!('} else', 'else')
            res.gsub!(/\n +} *\n/m, "\n")
            res.gsub(/ *{$/, '')
          end
        }
        s.gsub!(/ *$/, '')
        File.open(file, 'wb').write(s) if s != orig
      }
      
      Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
      Reviewed-by: default avatarhjk <qthjk@ovi.com>
      29a93998
  30. 28 Nov, 2012 1 commit
  31. 05 Oct, 2012 1 commit
  32. 06 Aug, 2012 1 commit
  33. 19 Jul, 2012 1 commit
  34. 26 Jan, 2012 1 commit
  35. 03 Nov, 2011 1 commit
  36. 16 Sep, 2011 1 commit
  37. 30 Jun, 2011 1 commit
  38. 29 Jun, 2011 1 commit
  39. 27 Jun, 2011 1 commit