From 03618254a3ae04a98acbaf0df64974b926b61d1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Wed, 5 Nov 2014 23:17:11 +0100 Subject: [PATCH] new grid view style in MacOSX --- YACReaderLibrary/grid_comics_view.cpp | 10 +++++++--- YACReaderLibrary/qml/GridComicsView.qml | 15 ++------------- custom_widgets/yacreader_macosx_toolbar.mm | 2 ++ 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/YACReaderLibrary/grid_comics_view.cpp b/YACReaderLibrary/grid_comics_view.cpp index bebfaeb1..231ed770 100644 --- a/YACReaderLibrary/grid_comics_view.cpp +++ b/YACReaderLibrary/grid_comics_view.cpp @@ -65,16 +65,20 @@ void GridComicsView::setModel(ComicModel *model) } #ifdef Q_OS_MAC - ctxt->setContextProperty("backgroundColor", "#EDEDED"); + ctxt->setContextProperty("backgroundColor", "#F5F5F5"); ctxt->setContextProperty("cellColor", "#FFFFFF"); - ctxt->setContextProperty("selectedColor", "#DDDDDD"); + ctxt->setContextProperty("selectedColor", "#FFFFFF"); + ctxt->setContextProperty("selectedBorderColor", "#007AFF"); + ctxt->setContextProperty("borderColor", "#DBDBDB"); ctxt->setContextProperty("titleColor", "#121212"); ctxt->setContextProperty("textColor", "#636363"); - ctxt->setContextProperty("dropShadow",true); + #else ctxt->setContextProperty("backgroundColor", "#2A2A2A"); ctxt->setContextProperty("cellColor", "#212121"); ctxt->setContextProperty("selectedColor", "#121212"); + ctxt->setContextProperty("selectedBorderColor", "#121212"); + ctxt->setContextProperty("borderColor", "#121212"); ctxt->setContextProperty("titleColor", "#E6E6E6"); ctxt->setContextProperty("textColor", "#E6E6E6"); ctxt->setContextProperty("dropShadow",false); diff --git a/YACReaderLibrary/qml/GridComicsView.qml b/YACReaderLibrary/qml/GridComicsView.qml index 1ebedd21..8c7b3f82 100644 --- a/YACReaderLibrary/qml/GridComicsView.qml +++ b/YACReaderLibrary/qml/GridComicsView.qml @@ -49,6 +49,8 @@ Rectangle { width: 156; height: 287 color: ((dummyValue || !dummyValue) && comicsSelectionHelper.isSelectedIndex(index)) || grid.currentIndex === index?selectedColor:cellColor; + border.color: ((dummyValue || !dummyValue) && comicsSelectionHelper.isSelectedIndex(index)) || grid.currentIndex === index?selectedBorderColor:borderColor; + border.width: (Qt.platform.os === "osx")?1:0; anchors.horizontalCenter: parent.horizontalCenter @@ -127,19 +129,6 @@ Rectangle { } - DropShadow { - anchors.fill: source - horizontalOffset: 0 - verticalOffset: 0 - radius: 3 - samples: 24 - color: "#40000000" - transparentBorder: true; - source: realCell; - enabled: dropShadow; - visible: dropShadow; - } - /**/ //cover diff --git a/custom_widgets/yacreader_macosx_toolbar.mm b/custom_widgets/yacreader_macosx_toolbar.mm index 6b0f8fee..9725256d 100644 --- a/custom_widgets/yacreader_macosx_toolbar.mm +++ b/custom_widgets/yacreader_macosx_toolbar.mm @@ -260,6 +260,8 @@ YACReaderMacOSXSearchLineEdit::YACReaderMacOSXSearchLineEdit() NSTextField * searchEdit = [[NSSearchField alloc] initWithFrame:searchEditFrameRect]; //[searchEdit setBezelStyle:NSTextFieldRoundedBezel]; + [[searchEdit cell] setPlaceholderString:@"type to search"]; + MyTextFieldDelegate * delegate = [[MyTextFieldDelegate alloc] init]; delegate->mylineedit = this; [searchEdit setDelegate:delegate];