bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-01-14 19:06:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Linux: cefclient: Fix suggested file name display in the save file dialog (issue #1572).

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@2072 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2015-03-10 18:54:05 +00:00
parent 5d4942fdf3
commit 0b36550786
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/cefclient/browser/dialog_handler_gtk.cc
View File

@ -4,6 +4,9 @@
#include "cefclient/browser/dialog_handler_gtk.h" #include "cefclient/browser/dialog_handler_gtk.h"
#include <libgen.h>
#include <sys/stat.h>
#include "include/cef_browser.h" #include "include/cef_browser.h"
#include "include/cef_url.h" #include "include/cef_url.h"
#include "include/wrapper/cef_helpers.h" #include "include/wrapper/cef_helpers.h"
@ -176,7 +179,7 @@ bool ClientDialogHandlerGtk::OnFileDialog(
if (!title.empty()) { if (!title.empty()) {
title_str = title; title_str = title;
} else { } else {
switch (mode) { switch (mode_type) {
case FILE_DIALOG_OPEN: case FILE_DIALOG_OPEN:
title_str = "Open File"; title_str = "Open File";
break; break;
@ -218,8 +221,25 @@ bool ClientDialogHandlerGtk::OnFileDialog(
!(mode & FILE_DIALOG_HIDEREADONLY_FLAG)); !(mode & FILE_DIALOG_HIDEREADONLY_FLAG));
if (!default_file_path.empty()) { if (!default_file_path.empty()) {
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), const std::string& file_path = default_file_path;
default_file_path.ToString().c_str()); bool exists = false;
if (mode_type == FILE_DIALOG_SAVE) {
struct stat sb;
if (stat(file_path.c_str(), &sb) == 0 && S_ISREG(sb.st_mode)) {
// Use the directory and name of the existing file.
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
file_path.data());
exists = true;
}
}
if (!exists) {
// Set the current file name but let the user choose the directory.
std::string file_name_str = file_path;
const char* file_name = basename(const_cast<char*>(file_name_str.data()));
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), file_name);
}
} }
std::vector<GtkFileFilter*> filters; std::vector<GtkFileFilter*> filters;