Commit d42f44e5 authored by Kateryna Kostiuk's avatar Kateryna Kostiuk
Browse files

conversation: fix message copy action

Change-Id: Ide81f396d3ce0b218b227d3575a84d823f9a6037
parent 6c3ff707
......@@ -1236,7 +1236,6 @@ typedef NS_ENUM(NSInteger, MessageSequencing) {
}
-(void) resetSendMessagePanelToDefaultSize {
[self updatePlaceholder];
if(messageHeight.constant != MESSAGE_VIEW_DEFAULT_HEIGHT) {
sendPanelHeight.constant = SEND_PANEL_DEFAULT_HEIGHT;
messageHeight.constant = MESSAGE_VIEW_DEFAULT_HEIGHT;
......@@ -1320,9 +1319,6 @@ typedef NS_ENUM(NSInteger, MessageSequencing) {
-(void)textDidChange:(NSNotification *)notification {
[self checkIfComposingMsg];
if (self.message.length) {
[self updatePlaceholder];
}
self.enableSendButton = self.message.length > 0 || [(NSMutableArray*)MessagesVC. pendingFiles[convUid_.toNSString()] count] > 0;
}
......
......@@ -56,6 +56,11 @@
[title drawInRect:rectText withAttributes: attributes];
}
//prevent view from receiving all events, they should be transfered to conversation view
- (NSView *)hitTest:(NSPoint)point {
return nil;
}
#pragma mark - Destination Operations
- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
......
......@@ -578,7 +578,7 @@
<rect key="frame" x="0.0" y="0.0" width="516" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textView drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" quoteSubstitution="YES" linkDetection="YES" dashSubstitution="YES" spellingCorrection="YES" grammarChecking="YES" smartInsertDelete="YES" id="rQj-9q-WQ6">
<textView drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" quoteSubstitution="YES" linkDetection="YES" dashSubstitution="YES" spellingCorrection="YES" grammarChecking="YES" smartInsertDelete="YES" id="rQj-9q-WQ6" customClass="TextViewWithPlaceholder">
<rect key="frame" x="0.0" y="0.0" width="516" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
......@@ -730,7 +730,7 @@
<subviews>
<collectionView id="mqn-8s-hQD">
<rect key="frame" x="0.0" y="0.0" width="798" height="84"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES"/>
<autoresizingMask key="autoresizingMask" heightSizable="YES"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumInteritemSpacing="6" minimumLineSpacing="6" scrollDirection="horizontal" id="lkr-H8-IkF">
<size key="itemSize" width="226" height="84"/>
</collectionViewFlowLayout>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment