Allow window sizes smaller than 400x400

pull/943/head
Nicolas Werner 3 years ago
parent 1df1b5037e
commit e077bdbdd5
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
  1. 16
      resources/qml/MessageInput.qml
  2. 7
      src/Config.h
  3. 4
      src/MainWindow.cpp
  4. 2
      src/dialogs/CreateRoom.cpp

@ -32,6 +32,7 @@ Rectangle {
visible: room ? room.permissions.canSend(MtxEvent.TextMessage) : false
anchors.fill: parent
spacing: 0
ImageButton {
visible: CallManager.callsSupported
@ -88,8 +89,13 @@ Rectangle {
Layout.alignment: Qt.AlignVCenter
Layout.maximumHeight: Window.height / 4
Layout.minimumHeight: Settings.fontSize
implicitWidth: inputBar.width - 5 * (22 + 16) - 24
Layout.minimumHeight: fontMetrics.lineSpacing
Layout.preferredHeight: contentHeight
Layout.fillWidth: true
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
contentWidth: availableWidth
TextArea {
id: messageInput
@ -121,10 +127,12 @@ Rectangle {
placeholderText: qsTr("Write a message...")
placeholderTextColor: Nheko.colors.buttonText
color: Nheko.colors.text
width: textInput.width
width: textInput.width
verticalAlignment: TextEdit.AlignVCenter
wrapMode: TextEdit.Wrap
padding: 8
padding: 0
topPadding: 8
bottomPadding: 8
focus: true
onTextChanged: {
if (room)

@ -39,9 +39,6 @@ constexpr int labelSize = 15;
}
namespace modals {
constexpr int MIN_WIDGET_WIDTH = 400;
constexpr int MIN_WIDGET_HEIGHT = 400;
constexpr int WIDGET_MARGIN = 20;
constexpr int WIDGET_SPACING = 15;
constexpr int WIDGET_TOP_MARGiN = 2 * WIDGET_MARGIN;
@ -76,8 +73,8 @@ constexpr int height = 600;
constexpr int width = 1066;
constexpr int minModalWidth = 340;
constexpr int minHeight = height;
constexpr int minWidth = 950;
constexpr int minHeight = 340;
constexpr int minWidth = 340;
} // namespace window
namespace textInput {

@ -70,8 +70,8 @@ MainWindow::MainWindow(QWindow *parent)
MainWindow::setWindowTitle(0);
setObjectName(QStringLiteral("MainWindow"));
setResizeMode(QQuickView::SizeRootObjectToView);
setMinimumHeight(400);
setMinimumWidth(400);
setMinimumHeight(conf::window::minHeight);
setMinimumWidth(conf::window::minWidth);
restoreWindowSize();
chat_page_ = new ChatPage(userSettings_, this);

@ -28,7 +28,7 @@ CreateRoom::CreateRoom(QWidget *parent)
largeFont.setPointSizeF(largeFont.pointSizeF() * 1.5);
setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
setMinimumHeight(conf::modals::MIN_WIDGET_HEIGHT);
setMinimumHeight(conf::window::minHeight);
setMinimumWidth(conf::window::minModalWidth);
auto layout = new QVBoxLayout(this);

Loading…
Cancel
Save