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

Emoji picker #1608

Merged
merged 7 commits into from Oct 30, 2017
Merged

Emoji picker #1608

merged 7 commits into from Oct 30, 2017

Conversation

liliakai
Copy link
Contributor

Closes #194

liliakai and others added 7 commits October 24, 2017 18:54
This integrates a simple third party emoji panel with a few css overrides to
correct some relative paths and colors.

The trickiest thing about this is ensuring we don't break the layout, which is
acheived through precise control over the panel's height, and prodigious calls
to updateMessageFieldSize.

// FREEBIE
To better facilitate multiple emoji entry.

// FREEBIE
This makes our bottom-bar button arrangement more comfortable and consistent
with Android.

// FREEBIE
Don't just append to the end like a n00b! Also handle selected text correctly.
https://stackoverflow.com/questions/11076975

// FREEBIE
- No gray buffer on the right side of the emoji panel
- No gray buffer between message compose text box and emoji window
- The scroll bar for the emojis is the same as our normal scrollbars
@@ -111,14 +111,15 @@ button.emoji {

.emoji-panel-container {
height: 0px;
.ep-container {
padding-bottom: 5px;
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think you want at least a pixel between the bottom of the scroll handle and the blue outline on the message field.

Copy link
Contributor

Choose a reason for hiding this comment

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

I prefer no buffer; I think it makes things cleaner. But we'll see what the team says when they get a chance to play with it!

@scottnonnenberg scottnonnenberg merged commit fb931b4 into master Oct 30, 2017
@scottnonnenberg scottnonnenberg deleted the emoji branch October 30, 2017 20:54
scottnonnenberg added a commit that referenced this pull request Oct 30, 2017
Emoji picker (#1608)

Prevent drawAttention() when notifications are turned off - thanks
@canerelci! (#1612)

Support new 833 area code with update to libphonenumber (#1598)

Dev:
  - Support for beta releases installed beside production versions
    (#1606)
  - Display of environment and app instance in title bar/about window
    (#1606)
  - Fix json parsing exceptions obscuring server errors (#1605)
@jeremymasters
Copy link

Did the emoji picker get commented out? I don't see it. Also don't see the change of the paperclip being to the right of the microphone. version 1.0.36
image

@liliakai
Copy link
Contributor Author

liliakai commented Nov 8, 2017

@jeremymasters It's in v1.0.35-beta.1, not merged into master yet, but soon I expect. 😄

@kolbma
Copy link

kolbma commented Dec 8, 2017

What's up with this? It is now 1.0.41 and nothing available.

@jeremymasters
Copy link

@kolbma It's in the 1.1 beta

scottnonnenberg added a commit that referenced this pull request Dec 20, 2017
Note: This release is the same thing as https://github.com/WhisperSystems/Signal-Desktop/releases/tag/v1.1.0-beta.6

Listed below are the changes from the previous production release: https://github.com/WhisperSystems/Signal-Desktop/releases/tag/v1.0.41

Update to electron 1.7.9 (#1736)

Support the latest phone number formats via libphonenumber update (#1899)

Reduce download size by ~25MB over the previous production build (#1869)

Emoji - thanks @liliakai:
  - Emoji picker (#1608)
  - Add support for Emoji 5 (#1797)

Notifications:
  - Windows 7: Use an alternate mechanism for notifications (#1812)
  - Prevent drawAttention() when notifications are turned off - thanks @canerelci! (#1612)

Linux:
  - Support for current (artful) and previous (xenial) ubuntu versions (#1856)
  - Fix missing application icon on some Linux distributions (#1735)
  - Fix issue where window would not show new message alerts on some Linux systems - thanks @cornerman (#1820)
  - Add .deb specific dependencies - thanks @veggiedefender (#1858)

The default button is now 'later', not 'restart' in the 'update available' dialog (#1894)

Make the window minimum width a little smaller - thanks @emptyflask (#1863)

Intl-friendly sort order for contact lists (#1900)

Fix issue where update would restore deleted windows shortcut (#1804)

Fix issue where .tif file attachments could not be sent or received (#1901)

(in testing) Add a tray icon to the application behind command-line argument - thanks @m-pilia (#1676)
  --use-tray-icon enables the tray icon
  --start-in-tray enables the tray icon and the application starts minimized in the tray bar

(in testing) Support pass-through proxies with HTTPS_PROXY environment variable (#1878)

Dev:
  - Display of environment and app instance in title bar/about window (#1606)
  - Support for beta releases installed beside production versions (#1606)
  - Fix json parsing exceptions obscuring server errors (#1605)
  - Be resilient to thrown non-errors in import process (#1737)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants