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.

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

Add line simple object and selection for all #141

Merged
merged 25 commits into from
Dec 3, 2020
Merged

Add line simple object and selection for all #141

merged 25 commits into from
Dec 3, 2020

Conversation

JerdoAve
Copy link
Contributor

@JerdoAve JerdoAve commented Dec 3, 2020

  • change approach for saving of simple objects
  • implement highlighting hover and selection behaviour
  • add new simple object (line)

AndreiMazol and others added 23 commits November 26, 2020 13:58
- update package.json
- add logo to about.jsx
# Conflicts:
#	example/config/webpack.config.js
#	example/public/index.html
- enhance managing coordinates for simple objects
- add line
- add polyline
- update shape-circle.svg
- update shape-rectangle.svg
- add icon while sub-menu is opened
- Line is added
- Hover and selection added
This reverts commit d166ef3, reversing
changes made to 7f29d31.
- Prettier styles for simple object hover and selection
@JerdoAve
Copy link
Contributor Author

JerdoAve commented Dec 3, 2020

Hi Team,

I'm following your progress about Ketcher and I really like all the things around it.

I've decided to help a bit, and please have a look at my PR.

All the changes are included in the description.

Regards,
JA

@AndreiMazol
Copy link
Contributor

Dear @JerdoAve ,

thank you for your help in making our product better.

We will review your PR asap.

Best regards,
Ketcher team

@@ -20,6 +20,10 @@ import draw from '../draw'
import util from '../util'
import scale from '../../util/scale'
import Vec2 from 'src/script/util/vec2'
import { maxHeaderSize } from 'http'
import { ENGINE_METHOD_PKEY_ASN1_METHS } from 'constants'
Copy link
Contributor

Choose a reason for hiding this comment

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

unused imports should be deleted

@@ -14,6 +14,8 @@
* limitations under the License.
***************************************************************************/

import Vec2 from './vec2'
Copy link
Contributor

Choose a reason for hiding this comment

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

please delete unused import

@AndreiMazol
Copy link
Contributor

Dear @JerdoAve ,

I really appreciate your hard work! All looks great! I see that some my changes were overwritten by mistake so I have reverted them.

Looking forward for our further collaboration.

Best regards,
Andrei from Ketcher team

@AndreiMazol AndreiMazol changed the base branch from master to release/2.1 December 3, 2020 17:46
@AndreiMazol AndreiMazol merged commit 31223c0 into epam:release/2.1 Dec 3, 2020
@JerdoAve JerdoAve deleted the add-line-simple-object-and-selection-for-all branch December 3, 2020 18:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add line simple object Simple Objects Selection & Dragging Enhancements
2 participants